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

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
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <linux/phy_fixed.h> #include <linux/phy_fixed.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <net/dsa.h>
#include "dsa_priv.h" #include "dsa_priv.h"
static struct sk_buff *dsa_slave_notag_xmit(struct sk_buff *skb, static struct sk_buff *dsa_slave_notag_xmit(struct sk_buff *skb,
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_net.h> #include <linux/of_net.h>
#include <net/dsa.h>
#include "dsa_priv.h" #include "dsa_priv.h"
static LIST_HEAD(dsa_switch_trees); static LIST_HEAD(dsa_switch_trees);
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/netpoll.h> #include <linux/netpoll.h>
#include <net/dsa.h>
struct dsa_device_ops { struct dsa_device_ops {
struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev); struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <linux/phy_fixed.h> #include <linux/phy_fixed.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <net/dsa.h>
#include "dsa_priv.h" #include "dsa_priv.h"
/* switch driver registration ***********************************************/ /* switch driver registration ***********************************************/
......
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
#include <linux/of_mdio.h> #include <linux/of_mdio.h>
#include <linux/mdio.h> #include <linux/mdio.h>
#include <linux/list.h> #include <linux/list.h>
#include <net/dsa.h>
#include <net/rtnetlink.h> #include <net/rtnetlink.h>
#include <net/switchdev.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>
#include <linux/netpoll.h> #include <linux/netpoll.h>
#include "dsa_priv.h" #include "dsa_priv.h"
static bool dsa_slave_dev_check(struct net_device *dev); static bool dsa_slave_dev_check(struct net_device *dev);
......
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <net/dsa.h>
#include "dsa_priv.h"
static int dsa_switch_bridge_join(struct dsa_switch *ds, static int dsa_switch_bridge_join(struct dsa_switch *ds,
struct dsa_notifier_bridge_info *info) struct dsa_notifier_bridge_info *info)
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <net/dsa.h>
#include "dsa_priv.h" #include "dsa_priv.h"
/* This tag length is 4 bytes, older ones were 6 bytes, we do not /* This tag length is 4 bytes, older ones were 6 bytes, we do not
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <net/dsa.h>
#include "dsa_priv.h" #include "dsa_priv.h"
#define DSA_HLEN 4 #define DSA_HLEN 4
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <net/dsa.h>
#include "dsa_priv.h" #include "dsa_priv.h"
#define DSA_HLEN 4 #define DSA_HLEN 4
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <net/dsa.h>
#include "dsa_priv.h" #include "dsa_priv.h"
/* To define the outgoing port and to discover the incoming port a regular /* To define the outgoing port and to discover the incoming port a regular
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
*/ */
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <net/dsa.h>
#include "dsa_priv.h" #include "dsa_priv.h"
#define MTK_HDR_LEN 4 #define MTK_HDR_LEN 4
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
*/ */
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <net/dsa.h>
#include "dsa_priv.h" #include "dsa_priv.h"
#define QCA_HDR_LEN 2 #define QCA_HDR_LEN 2
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <net/dsa.h>
#include "dsa_priv.h" #include "dsa_priv.h"
static struct sk_buff *trailer_xmit(struct sk_buff *skb, struct net_device *dev) static struct sk_buff *trailer_xmit(struct sk_buff *skb, struct net_device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment