| Message ID | 20190403204418.3946-1-nikolay@cumulusnetworks.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: bridge: mcast: remove unused br_ip_equal function | expand |
From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Date: Wed, 3 Apr 2019 23:44:18 +0300 > Since the mcast conversion to rhashtable this function has been unused, so > remove it. > > Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Another reason to not use inline functions in foo.c files :-) Applied, thanks Nikolay.
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index f5343dfac282..afef6fc2c074 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -65,23 +65,6 @@ static void br_ip6_multicast_leave_group(struct net_bridge *br, __u16 vid, const unsigned char *src); #endif -static inline int br_ip_equal(const struct br_ip *a, const struct br_ip *b) -{ - if (a->proto != b->proto) - return 0; - if (a->vid != b->vid) - return 0; - switch (a->proto) { - case htons(ETH_P_IP): - return a->u.ip4 == b->u.ip4; -#if IS_ENABLED(CONFIG_IPV6) - case htons(ETH_P_IPV6): - return ipv6_addr_equal(&a->u.ip6, &b->u.ip6); -#endif - } - return 0; -} - static struct net_bridge_mdb_entry *br_mdb_ip_get_rcu(struct net_bridge *br, struct br_ip *dst) {
Since the mcast conversion to rhashtable this function has been unused, so remove it. Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> --- net/bridge/br_multicast.c | 17 ----------------- 1 file changed, 17 deletions(-)