diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2017-03-28 23:45:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-29 07:46:04 +0200 |
| commit | c6e970a04bdceb7ef1fdbac6be3bd4cd0a0a02bd (patch) | |
| tree | f7e2edac17a1e10cf21407c7cc99790d8a43e725 /drivers/net/dsa/bcm_sf2_cfp.c | |
| parent | Merge branch 'netconf-delnetconf' (diff) | |
| download | linux-c6e970a04bdceb7ef1fdbac6be3bd4cd0a0a02bd.tar.xz linux-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 'drivers/net/dsa/bcm_sf2_cfp.c')
| -rw-r--r-- | drivers/net/dsa/bcm_sf2_cfp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c index 346dd9a1232d..2fb32d67065f 100644 --- a/drivers/net/dsa/bcm_sf2_cfp.c +++ b/drivers/net/dsa/bcm_sf2_cfp.c @@ -10,10 +10,11 @@ */ #include <linux/list.h> -#include <net/dsa.h> #include <linux/ethtool.h> #include <linux/if_ether.h> #include <linux/in.h> +#include <linux/netdevice.h> +#include <net/dsa.h> #include <linux/bitmap.h> #include "bcm_sf2.h" |