Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[linux-2.6-microblaze.git] / net / bridge / br_multicast.c

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 20ed7ad..024139b 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -158,7 +158,7 @@ struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
        struct net_bridge_mdb_htable *mdb = rcu_dereference(br->mdb);
        struct br_ip ip;
 
-       if (br->multicast_disabled)
+       if (!br_opt_get(br, BROPT_MULTICAST_ENABLED))
                return NULL;
 
        if (BR_INPUT_SKB_CB(skb)->igmp)
@@ -411,7 +411,7 @@ static struct sk_buff *br_ip4_multicast_alloc_query(struct net_bridge *br,
        iph->frag_off = htons(IP_DF);
        iph->ttl = 1;
        iph->protocol = IPPROTO_IGMP;
-       iph->saddr = br->multicast_query_use_ifaddr ?
+       iph->saddr = br_opt_get(br, BROPT_MULTICAST_QUERY_USE_IFADDR) ?
                     inet_select_addr(br->dev, 0, RT_SCOPE_LINK) : 0;
        iph->daddr = htonl(INADDR_ALLHOSTS_GROUP);
        ((u8 *)&iph[1])[0] = IPOPT_RA;
@@ -503,11 +503,11 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,
        if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
                               &ip6h->saddr)) {
                kfree_skb(skb);
-               br->has_ipv6_addr = 0;
+               br_opt_toggle(br, BROPT_HAS_IPV6_ADDR, false);
                return NULL;
        }
 
-       br->has_ipv6_addr = 1;
+       br_opt_toggle(br, BROPT_HAS_IPV6_ADDR, true);
        ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest);
 
        hopopt = (u8 *)(ip6h + 1);
@@ -628,7 +628,7 @@ static struct net_bridge_mdb_entry *br_multicast_get_group(
                                port ? port->dev->name : br->dev->name);
                        err = -E2BIG;
 disable:
-                       br->multicast_disabled = 1;
+                       br_opt_toggle(br, BROPT_MULTICAST_ENABLED, false);
                        goto err;
                }
        }
@@ -894,7 +894,7 @@ static void br_multicast_querier_expired(struct net_bridge *br,
                                         struct bridge_mcast_own_query *query)
 {
        spin_lock(&br->multicast_lock);
-       if (!netif_running(br->dev) || br->multicast_disabled)
+       if (!netif_running(br->dev) || !br_opt_get(br, BROPT_MULTICAST_ENABLED))
                goto out;
 
        br_multicast_start_querier(br, query);
@@ -965,8 +965,9 @@ static void br_multicast_send_query(struct net_bridge *br,
        struct br_ip br_group;
        unsigned long time;
 
-       if (!netif_running(br->dev) || br->multicast_disabled ||
-           !br->multicast_querier)
+       if (!netif_running(br->dev) ||
+           !br_opt_get(br, BROPT_MULTICAST_ENABLED) ||
+           !br_opt_get(br, BROPT_MULTICAST_QUERIER))
                return;
 
        memset(&br_group.u, 0, sizeof(br_group.u));
@@ -1036,7 +1037,7 @@ static void br_mc_disabled_update(struct net_device *dev, bool value)
                .orig_dev = dev,
                .id = SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED,
                .flags = SWITCHDEV_F_DEFER,
-               .u.mc_disabled = value,
+               .u.mc_disabled = !value,
        };
 
        switchdev_port_attr_set(dev, &attr);
@@ -1054,7 +1055,8 @@ int br_multicast_add_port(struct net_bridge_port *port)
        timer_setup(&port->ip6_own_query.timer,
                    br_ip6_multicast_port_query_expired, 0);
 #endif
-       br_mc_disabled_update(port->dev, port->br->multicast_disabled);
+       br_mc_disabled_update(port->dev,
+                             br_opt_get(port->br, BROPT_MULTICAST_ENABLED));
 
        port->mcast_stats = netdev_alloc_pcpu_stats(struct bridge_mcast_stats);
        if (!port->mcast_stats)
@@ -1091,7 +1093,7 @@ static void __br_multicast_enable_port(struct net_bridge_port *port)
 {
        struct net_bridge *br = port->br;
 
-       if (br->multicast_disabled || !netif_running(br->dev))
+       if (!br_opt_get(br, BROPT_MULTICAST_ENABLED) || !netif_running(br->dev))
                return;
 
        br_multicast_enable(&port->ip4_own_query);
@@ -1634,7 +1636,7 @@ br_multicast_leave_group(struct net_bridge *br,
        if (timer_pending(&other_query->timer))
                goto out;
 
-       if (br->multicast_querier) {
+       if (br_opt_get(br, BROPT_MULTICAST_QUERIER)) {
                __br_multicast_send_query(br, port, &mp->addr);
 
                time = jiffies + br->multicast_last_member_count *
@@ -1746,7 +1748,7 @@ static void br_multicast_err_count(const struct net_bridge *br,
        struct bridge_mcast_stats __percpu *stats;
        struct bridge_mcast_stats *pstats;
 
-       if (!br->multicast_stats_enabled)
+       if (!br_opt_get(br, BROPT_MULTICAST_STATS_ENABLED))
                return;
 
        if (p)
@@ -1904,7 +1906,7 @@ int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port,
        BR_INPUT_SKB_CB(skb)->igmp = 0;
        BR_INPUT_SKB_CB(skb)->mrouters_only = 0;
 
-       if (br->multicast_disabled)
+       if (!br_opt_get(br, BROPT_MULTICAST_ENABLED))
                return 0;
 
        switch (skb->protocol) {
@@ -1956,8 +1958,6 @@ void br_multicast_init(struct net_bridge *br)
        br->hash_max = 512;
 
        br->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
-       br->multicast_querier = 0;
-       br->multicast_query_use_ifaddr = 0;
        br->multicast_last_member_count = 2;
        br->multicast_startup_query_count = 2;
 
@@ -1976,7 +1976,8 @@ void br_multicast_init(struct net_bridge *br)
        br->ip6_other_query.delay_time = 0;
        br->ip6_querier.port = NULL;
 #endif
-       br->has_ipv6_addr = 1;
+       br_opt_toggle(br, BROPT_MULTICAST_ENABLED, true);
+       br_opt_toggle(br, BROPT_HAS_IPV6_ADDR, true);
 
        spin_lock_init(&br->multicast_lock);
        timer_setup(&br->multicast_router_timer,
@@ -1998,7 +1999,7 @@ static void __br_multicast_open(struct net_bridge *br,
 {
        query->startup_sent = 0;
 
-       if (br->multicast_disabled)
+       if (!br_opt_get(br, BROPT_MULTICAST_ENABLED))
                return;
 
        mod_timer(&query->timer, jiffies);
@@ -2173,12 +2174,12 @@ int br_multicast_toggle(struct net_bridge *br, unsigned long val)
        int err = 0;
 
        spin_lock_bh(&br->multicast_lock);
-       if (br->multicast_disabled == !val)
+       if (!!br_opt_get(br, BROPT_MULTICAST_ENABLED) == !!val)
                goto unlock;
 
-       br_mc_disabled_update(br->dev, !val);
-       br->multicast_disabled = !val;
-       if (br->multicast_disabled)
+       br_mc_disabled_update(br->dev, val);
+       br_opt_toggle(br, BROPT_MULTICAST_ENABLED, !!val);
+       if (!br_opt_get(br, BROPT_MULTICAST_ENABLED))
                goto unlock;
 
        if (!netif_running(br->dev))
@@ -2189,7 +2190,7 @@ int br_multicast_toggle(struct net_bridge *br, unsigned long val)
                if (mdb->old) {
                        err = -EEXIST;
 rollback:
-                       br->multicast_disabled = !!val;
+                       br_opt_toggle(br, BROPT_MULTICAST_ENABLED, false);
                        goto unlock;
                }
 
@@ -2213,7 +2214,7 @@ bool br_multicast_enabled(const struct net_device *dev)
 {
        struct net_bridge *br = netdev_priv(dev);
 
-       return !br->multicast_disabled;
+       return !!br_opt_get(br, BROPT_MULTICAST_ENABLED);
 }
 EXPORT_SYMBOL_GPL(br_multicast_enabled);
 
@@ -2236,10 +2237,10 @@ int br_multicast_set_querier(struct net_bridge *br, unsigned long val)
        val = !!val;
 
        spin_lock_bh(&br->multicast_lock);
-       if (br->multicast_querier == val)
+       if (br_opt_get(br, BROPT_MULTICAST_QUERIER) == val)
                goto unlock;
 
-       br->multicast_querier = val;
+       br_opt_toggle(br, BROPT_MULTICAST_QUERIER, !!val);
        if (!val)
                goto unlock;
 
@@ -2560,7 +2561,7 @@ void br_multicast_count(struct net_bridge *br, const struct net_bridge_port *p,
        struct bridge_mcast_stats __percpu *stats;
 
        /* if multicast_disabled is true then igmp type can't be set */
-       if (!type || !br->multicast_stats_enabled)
+       if (!type || !br_opt_get(br, BROPT_MULTICAST_STATS_ENABLED))
                return;
 
        if (p)