summaryrefslogtreecommitdiff
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2011-11-25 18:32:52 +0400
committerDavid S. Miller <davem@davemloft.net>2011-11-26 23:48:14 +0400
commitcf50dcc24f82a6dc2bce523eec2a979eb1b106e2 (patch)
tree579bd064fc0ee8475ca5c8e5d5f6295b82247c3a /include/linux/netdevice.h
parent6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (diff)
downloadlinux-cf50dcc24f82a6dc2bce523eec2a979eb1b106e2.tar.xz
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 {
struct vlan_group __rcu *vlgrp; /* VLAN group */
#endif
#ifdef CONFIG_NET_DSA
- void *dsa_ptr; /* dsa specific data */
+ struct dsa_switch_tree *dsa_ptr; /* dsa specific data */
#endif
void *atalk_ptr; /* AppleTalk link */
struct in_device __rcu *ip_ptr; /* IPv4 specific data */