Commit 7a572964 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: bridge: remove __br_vlan_filter_toggle 



This function is identical with br_vlan_filter_toggle.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c48f8607

net/bridge/br_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -1212,7 +1212,7 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], 
	if (data[IFLA_BR_VLAN_FILTERING]) {

		u8 vlan_filter = nla_get_u8(data[IFLA_BR_VLAN_FILTERING]);



		err = __br_vlan_filter_toggle(br, vlan_filter);

		err = br_vlan_filter_toggle(br, vlan_filter);

		if (err)

			return err;

	}

net/bridge/br_private.h

+2 −3
Original line number Diff line number Diff line
@@ -1085,7 +1085,6 @@ int br_vlan_delete(struct net_bridge *br, u16 vid); 
void br_vlan_flush(struct net_bridge *br);

struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group *vg, u16 vid);

void br_recalculate_fwd_mask(struct net_bridge *br);

int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val);

int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val);

int __br_vlan_set_proto(struct net_bridge *br, __be16 proto);

int br_vlan_set_proto(struct net_bridge *br, unsigned long val);
@@ -1261,7 +1260,7 @@ static inline u16 br_get_pvid(const struct net_bridge_vlan_group *vg) 
	return 0;

}



static inline int __br_vlan_filter_toggle(struct net_bridge *br,

static inline int br_vlan_filter_toggle(struct net_bridge *br,

					unsigned long val)

{

	return -EOPNOTSUPP;

net/bridge/br_vlan.c

+1 −6
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ void br_recalculate_fwd_mask(struct net_bridge *br) 
					      ~(1u << br->group_addr[5]);

}



int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)

int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)

{

	struct switchdev_attr attr = {

		.orig_dev = br->dev,
@@ -831,11 +831,6 @@ int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val) 
	return 0;

}



int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)

{

	return __br_vlan_filter_toggle(br, val);

}



bool br_vlan_enabled(const struct net_device *dev)

{

	struct net_bridge *br = netdev_priv(dev);