summaryrefslogtreecommitdiff
path: root/net/dsa
diff options
context:
space:
mode:
Diffstat (limited to 'net/dsa')
-rw-r--r--net/dsa/Makefile2
-rw-r--r--net/dsa/dsa.c (renamed from net/dsa/dsa2.c)1
-rw-r--r--net/dsa/dsa.h40
-rw-r--r--net/dsa/dsa_priv.h28
-rw-r--r--net/dsa/master.c2
-rw-r--r--net/dsa/port.c2
-rw-r--r--net/dsa/slave.c1
-rw-r--r--net/dsa/switch.c1
8 files changed, 46 insertions, 31 deletions
diff --git a/net/dsa/Makefile b/net/dsa/Makefile
index f38d0f4bf76c..cc7e93a562fe 100644
--- a/net/dsa/Makefile
+++ b/net/dsa/Makefile
@@ -3,7 +3,7 @@
obj-$(CONFIG_NET_DSA) += dsa_core.o
dsa_core-y += \
devlink.o \
- dsa2.o \
+ dsa.o \
master.o \
netlink.o \
port.o \
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa.c
index 7a75b0767dd1..fee4d28b7304 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa.c
@@ -20,6 +20,7 @@
#include <net/sch_generic.h>
#include "devlink.h"
+#include "dsa.h"
#include "dsa_priv.h"
#include "master.h"
#include "port.h"
diff --git a/net/dsa/dsa.h b/net/dsa/dsa.h
new file mode 100644
index 000000000000..b7e17ae1094d
--- /dev/null
+++ b/net/dsa/dsa.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef __DSA_H
+#define __DSA_H
+
+#include <linux/list.h>
+#include <linux/types.h>
+
+struct dsa_db;
+struct dsa_device_ops;
+struct dsa_lag;
+struct dsa_switch_tree;
+struct net_device;
+struct work_struct;
+
+extern struct list_head dsa_tree_list;
+
+bool dsa_db_equal(const struct dsa_db *a, const struct dsa_db *b);
+bool dsa_schedule_work(struct work_struct *work);
+void dsa_lag_map(struct dsa_switch_tree *dst, struct dsa_lag *lag);
+void dsa_lag_unmap(struct dsa_switch_tree *dst, struct dsa_lag *lag);
+struct dsa_lag *dsa_tree_lag_find(struct dsa_switch_tree *dst,
+ const struct net_device *lag_dev);
+struct net_device *dsa_tree_find_first_master(struct dsa_switch_tree *dst);
+int dsa_tree_change_tag_proto(struct dsa_switch_tree *dst,
+ const struct dsa_device_ops *tag_ops,
+ const struct dsa_device_ops *old_tag_ops);
+void dsa_tree_master_admin_state_change(struct dsa_switch_tree *dst,
+ struct net_device *master,
+ bool up);
+void dsa_tree_master_oper_state_change(struct dsa_switch_tree *dst,
+ struct net_device *master,
+ bool up);
+unsigned int dsa_bridge_num_get(const struct net_device *bridge_dev, int max);
+void dsa_bridge_num_put(const struct net_device *bridge_dev,
+ unsigned int bridge_num);
+struct dsa_bridge *dsa_tree_bridge_find(struct dsa_switch_tree *dst,
+ const struct net_device *br);
+
+#endif
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 3f6f84150592..b7ec6efe8b74 100644
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -43,11 +43,6 @@ struct dsa_standalone_event_work {
u16 vid;
};
-/* dsa.c */
-bool dsa_db_equal(const struct dsa_db *a, const struct dsa_db *b);
-
-bool dsa_schedule_work(struct work_struct *work);
-
/* netlink.c */
extern struct rtnl_link_ops dsa_link_ops __read_mostly;
@@ -65,33 +60,10 @@ static inline bool dsa_switch_supports_mc_filtering(struct dsa_switch *ds)
!ds->needs_standalone_vlan_filtering;
}
-/* dsa2.c */
-void dsa_lag_map(struct dsa_switch_tree *dst, struct dsa_lag *lag);
-void dsa_lag_unmap(struct dsa_switch_tree *dst, struct dsa_lag *lag);
-struct dsa_lag *dsa_tree_lag_find(struct dsa_switch_tree *dst,
- const struct net_device *lag_dev);
-struct net_device *dsa_tree_find_first_master(struct dsa_switch_tree *dst);
-int dsa_tree_change_tag_proto(struct dsa_switch_tree *dst,
- const struct dsa_device_ops *tag_ops,
- const struct dsa_device_ops *old_tag_ops);
-void dsa_tree_master_admin_state_change(struct dsa_switch_tree *dst,
- struct net_device *master,
- bool up);
-void dsa_tree_master_oper_state_change(struct dsa_switch_tree *dst,
- struct net_device *master,
- bool up);
-unsigned int dsa_bridge_num_get(const struct net_device *bridge_dev, int max);
-void dsa_bridge_num_put(const struct net_device *bridge_dev,
- unsigned int bridge_num);
-struct dsa_bridge *dsa_tree_bridge_find(struct dsa_switch_tree *dst,
- const struct net_device *br);
-
/* tag_8021q.c */
int dsa_switch_tag_8021q_vlan_add(struct dsa_switch *ds,
struct dsa_notifier_tag_8021q_vlan_info *info);
int dsa_switch_tag_8021q_vlan_del(struct dsa_switch *ds,
struct dsa_notifier_tag_8021q_vlan_info *info);
-extern struct list_head dsa_tree_list;
-
#endif
diff --git a/net/dsa/master.c b/net/dsa/master.c
index e38b349ca7f8..26d90140d271 100644
--- a/net/dsa/master.c
+++ b/net/dsa/master.c
@@ -11,7 +11,7 @@
#include <linux/netlink.h>
#include <net/dsa.h>
-#include "dsa_priv.h"
+#include "dsa.h"
#include "master.h"
#include "port.h"
#include "tag.h"
diff --git a/net/dsa/port.c b/net/dsa/port.c
index bf2c98215021..e6d5c05b41b4 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -12,7 +12,7 @@
#include <linux/of_mdio.h>
#include <linux/of_net.h>
-#include "dsa_priv.h"
+#include "dsa.h"
#include "port.h"
#include "slave.h"
#include "switch.h"
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index a928aaf68804..d4c436930a04 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -22,6 +22,7 @@
#include <net/dcbnl.h>
#include <linux/netpoll.h>
+#include "dsa.h"
#include "dsa_priv.h"
#include "port.h"
#include "master.h"
diff --git a/net/dsa/switch.c b/net/dsa/switch.c
index b534116dc519..4420af0081af 100644
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
@@ -12,6 +12,7 @@
#include <linux/if_vlan.h>
#include <net/switchdev.h>
+#include "dsa.h"
#include "dsa_priv.h"
#include "port.h"
#include "slave.h"