diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-29 08:46:05 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-29 08:46:05 +0300 |
| commit | 2cebaecb047eeed51f4a7ee8b9556a49e4980ae2 (patch) | |
| tree | 97674d9de953c26b4ba9b723cdfc4d99af02dfc7 /include/linux | |
| parent | 0e42c72195cc1a6f7461bfc48b32dce29e1677f7 (diff) | |
| parent | 96567d5dacf47fd628bc3115c8a7d81866674cd3 (diff) | |
| download | linux-2cebaecb047eeed51f4a7ee8b9556a49e4980ae2.tar.xz | |
Merge branch 'dsa-devlink'
Andrew Lunn says:
====================
break include loop and dsa devlink support
These two patches add very basic support for devlink to DSA, in
preparation for playing with dpipe.
The first patch is needed to break an include loop between
netdevice.h, dsa.h and devlink.h. We need to remove dsa.h from
netdevice.h. As a result, some files fail to compile, because they
require includes pulled in via dsa.h. So this patch adds a number of
includes in various places. The majority is within the network
subsystem, but cifs also needs a few fixes.
0-day has been chewing on this for over a day now, and not found any
breakage. But Arnd's randconfig might uncover something.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b7365b587818..cc07c3be2705 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -41,7 +41,6 @@ #include <linux/ethtool.h> #include <net/net_namespace.h> -#include <net/dsa.h> #ifdef CONFIG_DCB #include <net/dcbnl.h> #endif @@ -57,6 +56,8 @@ struct netpoll_info; struct device; struct phy_device; +struct dsa_switch_tree; + /* 802.11 specific */ struct wireless_dev; /* 802.15.4 specific */ @@ -2004,15 +2005,6 @@ void dev_net_set(struct net_device *dev, struct net *net) write_pnet(&dev->nd_net, net); } -static inline bool netdev_uses_dsa(struct net_device *dev) -{ -#if IS_ENABLED(CONFIG_NET_DSA) - if (dev->dsa_ptr != NULL) - return dsa_uses_tagged_protocol(dev->dsa_ptr); -#endif - return false; -} - /** * netdev_priv - access network device private data * @dev: network device |