aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2011-11-25 09:32:52 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-26 14:48:14 -0500
commitcf50dcc24f82a6dc2bce523eec2a979eb1b106e2 (patch)
tree579bd064fc0ee8475ca5c8e5d5f6295b82247c3a /include/linux/netdevice.h
parent6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (diff)
dsa: Change dsa_uses_{dsa, trailer}_tags() into inline functions
eth_type_trans() will use these functions if DSA is enabled, which blocks building DSA as a module. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 999bb264fe27..63721a69804c 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1080,7 +1080,7 @@ struct net_device {
1080 struct vlan_group __rcu *vlgrp; /* VLAN group */ 1080 struct vlan_group __rcu *vlgrp; /* VLAN group */
1081#endif 1081#endif
1082#ifdef CONFIG_NET_DSA 1082#ifdef CONFIG_NET_DSA
1083 void *dsa_ptr; /* dsa specific data */ 1083 struct dsa_switch_tree *dsa_ptr; /* dsa specific data */
1084#endif 1084#endif
1085 void *atalk_ptr; /* AppleTalk link */ 1085 void *atalk_ptr; /* AppleTalk link */
1086 struct in_device __rcu *ip_ptr; /* IPv4 specific data */ 1086 struct in_device __rcu *ip_ptr; /* IPv4 specific data */