hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: dsa: include switchdev.h only once 

DSA drivers and core use switchdev. Include switchdev.h only once, in
the dsa.h public header, so that inclusion in DSA drivers or forward
declarations of switchdev structures in not necessary anymore.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2017-05-17 15:46:04 -04:00 committed by David S. Miller
parent ea5dd34be1
commit f0c24ccf49
8 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/dsa/b53/b53_common.c
View File

@ -29,7 +29,6 @@
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include <net/dsa.h> #include <net/dsa.h>
#include <net/switchdev.h>
#include "b53_regs.h" #include "b53_regs.h"
#include "b53_priv.h" #include "b53_priv.h"

1
drivers/net/dsa/bcm_sf2.c
View File

@ -28,7 +28,6 @@
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include <linux/brcmphy.h> #include <linux/brcmphy.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <net/switchdev.h>
#include <linux/platform_data/b53.h> #include <linux/platform_data/b53.h>
#include "bcm_sf2.h" #include "bcm_sf2.h"

1
drivers/net/dsa/dsa_loop.c
View File

@ -17,7 +17,6 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include <net/switchdev.h>
#include <net/dsa.h> #include <net/dsa.h>
#include "dsa_loop.h" #include "dsa_loop.h"

1
drivers/net/dsa/mt7530.c
View File

@ -28,7 +28,6 @@
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <net/dsa.h> #include <net/dsa.h>
#include <net/switchdev.h>
#include "mt7530.h" #include "mt7530.h"

1
drivers/net/dsa/mv88e6xxx/chip.c
View File

@ -32,7 +32,6 @@
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <net/dsa.h> #include <net/dsa.h>
#include <net/switchdev.h>
#include "mv88e6xxx.h" #include "mv88e6xxx.h"
#include "global1.h" #include "global1.h"

1
drivers/net/dsa/qca8k.c
View File

@ -18,7 +18,6 @@
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <net/dsa.h> #include <net/dsa.h>
#include <net/switchdev.h>
#include <linux/of_net.h> #include <linux/of_net.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/if_bridge.h> #include <linux/if_bridge.h>

7
include/net/dsa.h
View File

@ -20,6 +20,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <net/devlink.h> #include <net/devlink.h>
#include <net/switchdev.h>
struct tc_action; struct tc_action;
struct phy_device; struct phy_device;
@ -284,12 +285,6 @@ static inline u8 dsa_upstream_port(struct dsa_switch *ds)
return ds->rtable[dst->cpu_dp->ds->index]; return ds->rtable[dst->cpu_dp->ds->index];
} }
struct switchdev_trans;
struct switchdev_obj;
struct switchdev_obj_port_fdb;
struct switchdev_obj_port_mdb;
struct switchdev_obj_port_vlan;
#define DSA_NOTIFIER_BRIDGE_JOIN 1 #define DSA_NOTIFIER_BRIDGE_JOIN 1
#define DSA_NOTIFIER_BRIDGE_LEAVE 2 #define DSA_NOTIFIER_BRIDGE_LEAVE 2

1
net/dsa/slave.c
View File

@ -18,7 +18,6 @@
#include <linux/mdio.h> #include <linux/mdio.h>
#include <linux/list.h> #include <linux/list.h>
#include <net/rtnetlink.h> #include <net/rtnetlink.h>
#include <net/switchdev.h>
#include <net/pkt_cls.h> #include <net/pkt_cls.h>
#include <net/tc_act/tc_mirred.h> #include <net/tc_act/tc_mirred.h>
#include <linux/if_bridge.h> #include <linux/if_bridge.h>