diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2014-08-27 17:04:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-27 22:59:40 -0700 |
| commit | 5aed85cec29882d1c4b4b2a01cb75a99efdbe4ed (patch) | |
| tree | c2a68a4275a8aefb66c4d1e359d76704c6894817 /include/linux/netdevice.h | |
| parent | 0d8bcdd383b8865e752a7e8edb4712c2e3902052 (diff) | |
net: dsa: allow switches to work without tagging
In case switch port tagging is disabled (voluntarily, or the switch just
does not support it), allow us to continue using the defined set of
dsa_device_ops in net/dsa/slave.c.
We introduce dsa_protocol_is_tagged() to check whether we need to
override skb->protocol and go through the DSA-specifif packet_type
function, or if we just go on and receive the SKB through the normal
path.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 1875dc71422a..429801370d0c 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1784,10 +1784,10 @@ void dev_net_set(struct net_device *dev, struct net *net) static inline bool netdev_uses_dsa(struct net_device *dev) { #ifdef CONFIG_NET_DSA - return dev->dsa_ptr != NULL; -#else - return false; + if (dev->dsa_ptr != NULL) + return dsa_uses_tagged_protocol(dev->dsa_ptr); #endif + return false; } /** |