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

Commit ea5dd34b authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: include dsa.h only once 



The public include/net/dsa.h file is meant for DSA drivers, while all
DSA core files share a common private header net/dsa/dsa_priv.h file.

Ensure that dsa_priv.h is the only DSA core file to include net/dsa.h,
and add a new line to separate absolute and relative headers at the same
time.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de321ed3

net/dsa/dsa.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/phy_fixed.h>

#include <linux/gpio/consumer.h>

#include <linux/etherdevice.h>

#include <net/dsa.h>



#include "dsa_priv.h"



static struct sk_buff *dsa_slave_notag_xmit(struct sk_buff *skb,

net/dsa/dsa2.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/rtnetlink.h>

#include <linux/of.h>

#include <linux/of_net.h>

#include <net/dsa.h>



#include "dsa_priv.h"



static LIST_HEAD(dsa_switch_trees);

net/dsa/dsa_priv.h

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

#include <linux/netdevice.h>

#include <linux/netpoll.h>

#include <net/dsa.h>



struct dsa_device_ops {

	struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev);

net/dsa/legacy.c

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

#include <linux/phy_fixed.h>

#include <linux/etherdevice.h>

#include <net/dsa.h>



#include "dsa_priv.h"



/* switch driver registration ***********************************************/

net/dsa/slave.c

+1 −1
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
#include <linux/of_mdio.h>

#include <linux/mdio.h>

#include <linux/list.h>

#include <net/dsa.h>

#include <net/rtnetlink.h>

#include <net/switchdev.h>

#include <net/pkt_cls.h>

#include <net/tc_act/tc_mirred.h>

#include <linux/if_bridge.h>

#include <linux/netpoll.h>



#include "dsa_priv.h"



static bool dsa_slave_dev_check(struct net_device *dev);