[PATCH net-next 1/5] net: bridge: remove __br_vlan_filter_toggle
From: Vladimir Oltean <olteanv@gmail.com>
Date: 2021-02-13 20:45:04
Subsystem:
ethernet bridge, networking [general], the rest · Maintainers:
Nikolay Aleksandrov, Ido Schimmel, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Vladimir Oltean <vladimir.oltean@nxp.com> This function is identical with br_vlan_filter_toggle. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> --- net/bridge/br_netlink.c | 2 +- net/bridge/br_private.h | 5 ++--- net/bridge/br_vlan.c | 7 +------ 3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 7b513c5d347f..a12bbbdacb9b 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c@@ -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; }
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index a1639d41188b..0281de20212e 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h@@ -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,8 +1260,8 @@ 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, - unsigned long val) +static inline int br_vlan_filter_toggle(struct net_bridge *br, + unsigned long val) { return -EOPNOTSUPP; }
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index bb2909738518..26e7e06b6a0d 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c@@ -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);
--
2.25.1