net: dsa: move tag_8021q headers to their proper place

tag_8021q definitions are all over the place. Some are exported to linux/dsa/8021q.h (visible by DSA core, taggers, switch drivers and everyone else), and some are in dsa_priv.h. Move the structures that don't need external visibility into tag_8021q.c, and the ones which don't need the world or switch drivers to see them into tag_8021q.h. We also have the tag_8021q.h inclusion from switch.c, which is basically the entire reason why tag_8021q.c was built into DSA in commit 8b6e638b4be2 ("net: dsa: build tag_8021q.c as part of DSA core"). I still don't know how to better deal with that, so leave it alone.

Vladimir Oltean committed 3 years ago

Commit 19d05ea1 parent 8e396fe9 files · +48 −38Browse files

Showing the changes to include/linux/dsa (1 of 9 files). Show all

Unified · Split

include/linux/dsa/8021q.h+1−30

@@ -5,28 +5,8 @@ · 4 unmodified lines
5	#ifndef _NET_DSA_8021Q_H	5	#ifndef _NET_DSA_8021Q_H
6	#define _NET_DSA_8021Q_H	6	#define _NET_DSA_8021Q_H
7		7
8	#include <linux/refcount.h>
9	#include <linux/types.h>
10	#include <net/dsa.h>	8	#include <net/dsa.h>
11		9	#include <linux/types.h>
12	struct dsa_switch;
13	struct dsa_port;
14	struct sk_buff;
15	struct net_device;
16
17	struct dsa_tag_8021q_vlan {
18	struct list_head list;
19	int port;
20	u16 vid;
21	refcount_t refcount;
22	};
23
24	struct dsa_8021q_context {
25	struct dsa_switch *ds;
26	struct list_head vlans;
27	/* EtherType of RX VID, used for filtering on master interface */
28	__be16 proto;
29	};
30		10
31	int dsa_tag_8021q_register(struct dsa_switch *ds, __be16 proto);	11	int dsa_tag_8021q_register(struct dsa_switch *ds, __be16 proto);
32		12
@@ -38,15 +18,6 @@ int dsa_tag_8021q_bridge_join(struct dsa_switch *ds, int port, · 5 unmodified lines
38	void dsa_tag_8021q_bridge_leave(struct dsa_switch *ds, int port,	18	void dsa_tag_8021q_bridge_leave(struct dsa_switch *ds, int port,
39	struct dsa_bridge bridge);	19	struct dsa_bridge bridge);
40		20
41	struct sk_buff dsa_8021q_xmit(struct sk_buff skb, struct net_device *netdev,
42	u16 tpid, u16 tci);
43
44	void dsa_8021q_rcv(struct sk_buff skb, int source_port, int *switch_id,
45	int *vbid);
46
47	struct net_device dsa_tag_8021q_find_port_by_vbid(struct net_device master,
48	int vbid);
49
50	u16 dsa_tag_8021q_bridge_vid(unsigned int bridge_num);	21	u16 dsa_tag_8021q_bridge_vid(unsigned int bridge_num);
51		22
52	u16 dsa_tag_8021q_standalone_vid(const struct dsa_port *dp);	23	u16 dsa_tag_8021q_standalone_vid(const struct dsa_port *dp);