Commit 405be6b4 authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller
Browse files

switchdev: mrp: Remove CONFIG_BRIDGE_MRP 



Remove #IS_ENABLED(CONFIG_BRIDGE_MRP) from switchdev.h. This will
simplify the code implements MRP callbacks and will be similar with the
vlan filtering.

Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06b334f0

include/net/switchdev.h

+0 −10
Original line number Diff line number Diff line
@@ -27,9 +27,7 @@ enum switchdev_attr_id { 
	SWITCHDEV_ATTR_ID_BRIDGE_VLAN_PROTOCOL,

	SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED,

	SWITCHDEV_ATTR_ID_BRIDGE_MROUTER,

#if IS_ENABLED(CONFIG_BRIDGE_MRP)

	SWITCHDEV_ATTR_ID_MRP_PORT_ROLE,

#endif

};



struct switchdev_brport_flags {
@@ -51,9 +49,7 @@ struct switchdev_attr { 
		bool vlan_filtering;			/* BRIDGE_VLAN_FILTERING */

		u16 vlan_protocol;			/* BRIDGE_VLAN_PROTOCOL */

		bool mc_disabled;			/* MC_DISABLED */

#if IS_ENABLED(CONFIG_BRIDGE_MRP)

		u8 mrp_port_role;			/* MRP_PORT_ROLE */

#endif

	} u;

};
@@ -62,7 +58,6 @@ enum switchdev_obj_id { 
	SWITCHDEV_OBJ_ID_PORT_VLAN,

	SWITCHDEV_OBJ_ID_PORT_MDB,

	SWITCHDEV_OBJ_ID_HOST_MDB,

#if IS_ENABLED(CONFIG_BRIDGE_MRP)

	SWITCHDEV_OBJ_ID_MRP,

	SWITCHDEV_OBJ_ID_RING_TEST_MRP,

	SWITCHDEV_OBJ_ID_RING_ROLE_MRP,
@@ -70,8 +65,6 @@ enum switchdev_obj_id { 
	SWITCHDEV_OBJ_ID_IN_TEST_MRP,

	SWITCHDEV_OBJ_ID_IN_ROLE_MRP,

	SWITCHDEV_OBJ_ID_IN_STATE_MRP,



#endif

};



struct switchdev_obj {
@@ -103,7 +96,6 @@ struct switchdev_obj_port_mdb { 
	container_of((OBJ), struct switchdev_obj_port_mdb, obj)





#if IS_ENABLED(CONFIG_BRIDGE_MRP)

/* SWITCHDEV_OBJ_ID_MRP */

struct switchdev_obj_mrp {

	struct switchdev_obj obj;
@@ -183,8 +175,6 @@ struct switchdev_obj_in_state_mrp { 
#define SWITCHDEV_OBJ_IN_STATE_MRP(OBJ) \

	container_of((OBJ), struct switchdev_obj_in_state_mrp, obj)



#endif



typedef int switchdev_obj_dump_cb_t(struct switchdev_obj *obj);



enum switchdev_notifier_type {