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>
Showing
- drivers/net/dsa/bcm_sf2_cfp.c 2 additions, 1 deletiondrivers/net/dsa/bcm_sf2_cfp.c
- drivers/net/dsa/mv88e6xxx/mv88e6xxx.h 1 addition, 0 deletionsdrivers/net/dsa/mv88e6xxx/mv88e6xxx.h
- drivers/net/ethernet/broadcom/bcmsysport.c 1 addition, 0 deletionsdrivers/net/ethernet/broadcom/bcmsysport.c
- drivers/net/ethernet/freescale/fman/fman_memac.h 1 addition, 0 deletionsdrivers/net/ethernet/freescale/fman/fman_memac.h
- drivers/net/ethernet/hisilicon/hns/hnae.c 1 addition, 1 deletiondrivers/net/ethernet/hisilicon/hns/hnae.c
- drivers/net/ieee802154/mrf24j40.c 1 addition, 0 deletionsdrivers/net/ieee802154/mrf24j40.c
- drivers/net/phy/smsc.c 1 addition, 0 deletionsdrivers/net/phy/smsc.c
- drivers/net/usb/lan78xx.c 1 addition, 0 deletionsdrivers/net/usb/lan78xx.c
- fs/cifs/cifsfs.c 1 addition, 0 deletionsfs/cifs/cifsfs.c
- fs/cifs/connect.c 1 addition, 0 deletionsfs/cifs/connect.c
- fs/cifs/smb2pdu.c 1 addition, 0 deletionsfs/cifs/smb2pdu.c
- include/linux/netdevice.h 2 additions, 10 deletionsinclude/linux/netdevice.h
- include/net/dsa.h 9 additions, 0 deletionsinclude/net/dsa.h
- net/bridge/br_if.c 1 addition, 0 deletionsnet/bridge/br_if.c
- net/core/netprio_cgroup.c 1 addition, 0 deletionsnet/core/netprio_cgroup.c
- net/dsa/dsa.c 2 additions, 1 deletionnet/dsa/dsa.c
- net/dsa/dsa2.c 2 additions, 1 deletionnet/dsa/dsa2.c
- net/dsa/slave.c 1 addition, 0 deletionsnet/dsa/slave.c
- net/dsa/tag_brcm.c 1 addition, 0 deletionsnet/dsa/tag_brcm.c
- net/dsa/tag_dsa.c 1 addition, 0 deletionsnet/dsa/tag_dsa.c
Please register or sign in to comment