Commit 19d05ea7 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

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
8b6e638b ("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.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8e396fec

include/linux/dsa/8021q.h

+1 −30
Original line number Diff line number Diff line
@@ -5,28 +5,8 @@ 
#ifndef _NET_DSA_8021Q_H

#define _NET_DSA_8021Q_H



#include <linux/refcount.h>

#include <linux/types.h>

#include <net/dsa.h>



struct dsa_switch;

struct dsa_port;

struct sk_buff;

struct net_device;



struct dsa_tag_8021q_vlan {

	struct list_head list;

	int port;

	u16 vid;

	refcount_t refcount;

};



struct dsa_8021q_context {

	struct dsa_switch *ds;

	struct list_head vlans;

	/* EtherType of RX VID, used for filtering on master interface */

	__be16 proto;

};

#include <linux/types.h>



int dsa_tag_8021q_register(struct dsa_switch *ds, __be16 proto);
@@ -38,15 +18,6 @@ int dsa_tag_8021q_bridge_join(struct dsa_switch *ds, int port, 
void dsa_tag_8021q_bridge_leave(struct dsa_switch *ds, int port,

				struct dsa_bridge bridge);



struct sk_buff *dsa_8021q_xmit(struct sk_buff *skb, struct net_device *netdev,

			       u16 tpid, u16 tci);



void dsa_8021q_rcv(struct sk_buff *skb, int *source_port, int *switch_id,

		   int *vbid);



struct net_device *dsa_tag_8021q_find_port_by_vbid(struct net_device *master,

						   int vbid);



u16 dsa_tag_8021q_bridge_vid(unsigned int bridge_num);



u16 dsa_tag_8021q_standalone_vid(const struct dsa_port *dp);

include/net/dsa.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <net/devlink.h>

#include <net/switchdev.h>



struct dsa_8021q_context;

struct tc_action;

struct phy_device;

struct fixed_phy_status;

net/dsa/dsa_priv.h

+0 −8
Original line number Diff line number Diff line
@@ -13,15 +13,7 @@ 


#define DSA_MAX_NUM_OFFLOADING_BRIDGES		BITS_PER_LONG



struct dsa_notifier_tag_8021q_vlan_info;



/* netlink.c */

extern struct rtnl_link_ops dsa_link_ops __read_mostly;



/* 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);



#endif

net/dsa/port.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "port.h"

#include "slave.h"

#include "switch.h"

#include "tag_8021q.h"



/**

 * dsa_port_notify - Notify the switching fabric of changes to a port

net/dsa/switch.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "port.h"

#include "slave.h"

#include "switch.h"

#include "tag_8021q.h"



static unsigned int dsa_switch_fastest_ageing_time(struct dsa_switch *ds,

						   unsigned int ageing_time)