net: dsa: move headers exported by master.c to master.h

Minimize the use of the bloated dsa_priv.h by moving the prototypes
exported by master.c to their own header file.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 5a9cf74..10cd4ea 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -19,6 +19,7 @@
 
 #include "devlink.h"
 #include "dsa_priv.h"
+#include "master.h"
 #include "port.h"
 
 static DEFINE_MUTEX(dsa2_mutex);

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 81ddc52..94e385e 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -259,15 +259,6 @@ static inline int dsa_tag_protocol_overhead(const struct dsa_device_ops *ops)
        return ops->needed_headroom + ops->needed_tailroom;
 }
 
-/* master.c */
-int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp);
-void dsa_master_teardown(struct net_device *dev);
-int dsa_master_lag_setup(struct net_device *lag_dev, struct dsa_port *cpu_dp,
-                        struct netdev_lag_upper_info *uinfo,
-                        struct netlink_ext_ack *extack);
-void dsa_master_lag_teardown(struct net_device *lag_dev,
-                            struct dsa_port *cpu_dp);
-
 static inline struct net_device *dsa_master_find_slave(struct net_device *dev,
                                                       int device, int port)
 {

diff --git a/net/dsa/master.c b/net/dsa/master.c
index 0d3ef59..6105821 100644 (file)
--- a/net/dsa/master.c
+++ b/net/dsa/master.c
@@ -6,7 +6,13 @@
  *     Vivien Didelot <vivien.didelot@savoirfairelinux.com>
  */
 
+#include <linux/ethtool.h>
+#include <linux/netdevice.h>
+#include <linux/netlink.h>
+#include <net/dsa.h>
+
 #include "dsa_priv.h"
+#include "master.h"
 #include "port.h"
 
 static int dsa_master_get_regs_len(struct net_device *dev)

diff --git a/net/dsa/master.h b/net/dsa/master.h
new file mode 100644 (file)
index 0000000..3fc0e61
--- /dev/null
+++ b/net/dsa/master.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef __DSA_MASTER_H
+#define __DSA_MASTER_H
+
+struct dsa_port;
+struct net_device;
+struct netdev_lag_upper_info;
+struct netlink_ext_ack;
+
+int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp);
+void dsa_master_teardown(struct net_device *dev);
+int dsa_master_lag_setup(struct net_device *lag_dev, struct dsa_port *cpu_dp,
+                        struct netdev_lag_upper_info *uinfo,
+                        struct netlink_ext_ack *extack);
+void dsa_master_lag_teardown(struct net_device *lag_dev,
+                            struct dsa_port *cpu_dp);
+
+#endif

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index b782a17..523f9eb 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -24,6 +24,7 @@
 
 #include "dsa_priv.h"
 #include "port.h"
+#include "master.h"
 
 static void dsa_slave_standalone_event_work(struct work_struct *work)
 {