Commit 8e396fec authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: dsa: move definitions from dsa_priv.h to slave.c 



There are some definitions in dsa_priv.h which are only used from
slave.c. So move them to slave.c.

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 47d2ce03

net/dsa/dsa_priv.h

+0 −42
Original line number Diff line number Diff line
@@ -15,51 +15,9 @@ 


struct dsa_notifier_tag_8021q_vlan_info;



struct dsa_switchdev_event_work {

	struct net_device *dev;

	struct net_device *orig_dev;

	struct work_struct work;

	unsigned long event;

	/* Specific for SWITCHDEV_FDB_ADD_TO_DEVICE and

	 * SWITCHDEV_FDB_DEL_TO_DEVICE

	 */

	unsigned char addr[ETH_ALEN];

	u16 vid;

	bool host_addr;

};



enum dsa_standalone_event {

	DSA_UC_ADD,

	DSA_UC_DEL,

	DSA_MC_ADD,

	DSA_MC_DEL,

};



struct dsa_standalone_event_work {

	struct work_struct work;

	struct net_device *dev;

	enum dsa_standalone_event event;

	unsigned char addr[ETH_ALEN];

	u16 vid;

};



/* netlink.c */

extern struct rtnl_link_ops dsa_link_ops __read_mostly;



static inline bool dsa_switch_supports_uc_filtering(struct dsa_switch *ds)

{

	return ds->ops->port_fdb_add && ds->ops->port_fdb_del &&

	       ds->fdb_isolation && !ds->vlan_filtering_is_global &&

	       !ds->needs_standalone_vlan_filtering;

}



static inline bool dsa_switch_supports_mc_filtering(struct dsa_switch *ds)

{

	return ds->ops->port_mdb_add && ds->ops->port_mdb_del &&

	       ds->fdb_isolation && !ds->vlan_filtering_is_global &&

	       !ds->needs_standalone_vlan_filtering;

}



/* tag_8021q.c */

int dsa_switch_tag_8021q_vlan_add(struct dsa_switch *ds,

				  struct dsa_notifier_tag_8021q_vlan_info *info);

net/dsa/slave.c

+42 −0
Original line number Diff line number Diff line
@@ -29,6 +29,48 @@ 
#include "slave.h"

#include "tag.h"



struct dsa_switchdev_event_work {

	struct net_device *dev;

	struct net_device *orig_dev;

	struct work_struct work;

	unsigned long event;

	/* Specific for SWITCHDEV_FDB_ADD_TO_DEVICE and

	 * SWITCHDEV_FDB_DEL_TO_DEVICE

	 */

	unsigned char addr[ETH_ALEN];

	u16 vid;

	bool host_addr;

};



enum dsa_standalone_event {

	DSA_UC_ADD,

	DSA_UC_DEL,

	DSA_MC_ADD,

	DSA_MC_DEL,

};



struct dsa_standalone_event_work {

	struct work_struct work;

	struct net_device *dev;

	enum dsa_standalone_event event;

	unsigned char addr[ETH_ALEN];

	u16 vid;

};



static bool dsa_switch_supports_uc_filtering(struct dsa_switch *ds)

{

	return ds->ops->port_fdb_add && ds->ops->port_fdb_del &&

	       ds->fdb_isolation && !ds->vlan_filtering_is_global &&

	       !ds->needs_standalone_vlan_filtering;

}



static bool dsa_switch_supports_mc_filtering(struct dsa_switch *ds)

{

	return ds->ops->port_mdb_add && ds->ops->port_mdb_del &&

	       ds->fdb_isolation && !ds->vlan_filtering_is_global &&

	       !ds->needs_standalone_vlan_filtering;

}



static void dsa_slave_standalone_event_work(struct work_struct *work)

{

	struct dsa_standalone_event_work *standalone_work =