diff options
| author |   Andrew Lunn <andrew@lunn.ch> | 2017-03-28 23:45:06 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-03-28 22:46:04 -0700 |
| commit | c6e970a04bdceb7ef1fdbac6be3bd4cd0a0a02bd (patch) | |
| tree | f7e2edac17a1e10cf21407c7cc99790d8a43e725 /net/bridge/br_if.c | |
| parent | Merge branch 'netconf-delnetconf' (diff) | |
| download | linux-dev-c6e970a04bdceb7ef1fdbac6be3bd4cd0a0a02bd.tar.xz linux-dev-c6e970a04bdceb7ef1fdbac6be3bd4cd0a0a02bd.zip | |
net: break include loop netdevice.h, dsa.h, devlink.h
There is an include loop between netdevice.h, dsa.h, devlink.h because
of NETDEV_ALIGN, making it impossible to use devlink structures in
dsa.h.
Break this loop by taking dsa.h out of netdevice.h, add a forward
declaration of dsa_switch_tree and netdev_set_default_ethtool_ops()
function, which is what netdevice.h requires.
No longer having dsa.h in netdevice.h means the includes in dsa.h no
longer get included. This breaks a few other files which depend on
these includes. Add these directly in the affected file.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_if.c')
| -rw-r--r-- | net/bridge/br_if.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 8ac1770aa222..6eb52d422dd9 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -22,6 +22,7 @@ #include <linux/rtnetlink.h> #include <linux/if_ether.h> #include <linux/slab.h> +#include <net/dsa.h> #include <net/sock.h> #include <linux/if_vlan.h> #include <net/switchdev.h> |