summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.davemloft.net>2004-10-06 22:00:21 -0700
committerDavid S. Miller <davem@nuts.davemloft.net>2004-10-06 22:00:21 -0700
commitaa59d2c8a6dc8c90e305b72687559e6829e43388 (patch)
tree541eb8260e14f7306b02556ec651b29c39e190f3 /include/linux
parentc57512a686eb60b4f246bcbf98287557ef0dd227 (diff)
parent95e8c633258cc9943f168e4f676bdf68e6e25073 (diff)
Merge nuts.davemloft.net:/disk1/BK/acme-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/if_tr.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/if_tr.h b/include/linux/if_tr.h
index f7c97eeb95c8..4fd451f81ccb 100644
--- a/include/linux/if_tr.h
+++ b/include/linux/if_tr.h
@@ -48,6 +48,15 @@ struct trh_hdr {
__u16 rseg[8]; /* routing registers */
};
+#ifdef __KERNEL__
+#include <linux/skbuff.h>
+
+static inline struct trh_hdr *tr_hdr(const struct sk_buff *skb)
+{
+ return (struct trh_hdr *)skb->mac.raw;
+}
+#endif
+
/* This is an Token-Ring LLC structure */
struct trllc {
__u8 dsap; /* destination SAP */