Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / include / linux / if_tr.h

diff --git a/include/linux/if_tr.h b/include/linux/if_tr.h
index 3fba9e2f5427d633a9260854112647e9294b07a3..046e9d95ba9a55a79999f59449d181512aff4c97 100644 (file)
--- a/include/linux/if_tr.h
+++ b/include/linux/if_tr.h
@@ -47,8 +47,11 @@ struct trh_hdr {
 
 static inline struct trh_hdr *tr_hdr(const struct sk_buff *skb)
 {
-       return (struct trh_hdr *)skb->mac.raw;
+       return (struct trh_hdr *)skb_mac_header(skb);
 }
+#ifdef CONFIG_SYSCTL
+extern struct ctl_table tr_table[];
+#endif
 #endif
 
 /* This is an Token-Ring LLC structure */