Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6e970a0 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

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: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e42c721

drivers/net/dsa/bcm_sf2_cfp.c

+2 −1
Original line number Diff line number Diff line
@@ -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"

drivers/net/dsa/mv88e6xxx/mv88e6xxx.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/irq.h>

#include <linux/gpio/consumer.h>

#include <linux/phy.h>

#include <net/dsa.h>



#ifndef UINT64_MAX

#define UINT64_MAX		(u64)(~((u64)0))

drivers/net/ethernet/broadcom/bcmsysport.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/of_mdio.h>

#include <linux/phy.h>

#include <linux/phy_fixed.h>

#include <net/dsa.h>

#include <net/ip.h>

#include <net/ipv6.h>

drivers/net/ethernet/freescale/fman/fman_memac.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "fman_mac.h"



#include <linux/netdevice.h>

#include <linux/phy_fixed.h>



struct fman_mac *memac_config(struct fman_mac_params *params);

int memac_set_promiscuous(struct fman_mac *memac, bool new_val);

drivers/net/ethernet/hisilicon/hns/hnae.c

+1 −1
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ 


#include <linux/dma-mapping.h>

#include <linux/interrupt.h>

#include <linux/of.h>

#include <linux/skbuff.h>

#include <linux/slab.h>



#include "hnae.h"



#define cls_to_ae_dev(dev) container_of(dev, struct hnae_ae_dev, cls_dev)