Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / net / bridge / br_multicast.c

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 45e7f4173bbafe7e59e2ea514a7bccbee8456c79..c2a30f79a9d013de41e90e969324cb19075dfbfe 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -44,7 +44,6 @@ static const struct rhashtable_params br_mdb_rht_params = {
        .key_offset = offsetof(struct net_bridge_mdb_entry, addr),
        .key_len = sizeof(struct br_ip),
        .automatic_shrinking = true,
-       .locks_mul = 1,
 };
 
 static void br_multicast_start_querier(struct net_bridge *br,
@@ -65,23 +64,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)
 {
@@ -517,7 +499,7 @@ struct net_bridge_port_group *br_multicast_new_port_group(
        if (src)
                memcpy(p->eth_addr, src, ETH_ALEN);
        else
-               memset(p->eth_addr, 0xff, ETH_ALEN);
+               eth_broadcast_addr(p->eth_addr);
 
        return p;
 }
@@ -2194,7 +2176,7 @@ int br_multicast_list_adjacent(struct net_device *dev,
        int count = 0;
 
        rcu_read_lock();
-       if (!br_ip_list || !br_port_exists(dev))
+       if (!br_ip_list || !netif_is_bridge_port(dev))
                goto unlock;
 
        port = br_port_get_rcu(dev);
@@ -2241,7 +2223,7 @@ bool br_multicast_has_querier_anywhere(struct net_device *dev, int proto)
        bool ret = false;
 
        rcu_read_lock();
-       if (!br_port_exists(dev))
+       if (!netif_is_bridge_port(dev))
                goto unlock;
 
        port = br_port_get_rcu(dev);
@@ -2277,7 +2259,7 @@ bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto)
        bool ret = false;
 
        rcu_read_lock();
-       if (!br_port_exists(dev))
+       if (!netif_is_bridge_port(dev))
                goto unlock;
 
        port = br_port_get_rcu(dev);