diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 09:13:03 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 09:13:03 +0200 |
| commit | fcb06702f023a0e7b1e6ebf9746f34b610ca0508 (patch) | |
| tree | db022324c4978dd9af059be38822d23455a45f55 /net/bridge/br_multicast.c | |
| parent | wireless: reg: restore previous behaviour of chan->max_power calculations (diff) | |
| parent | bcma: add missing iounmap on error path (diff) | |
| download | linux-fcb06702f023a0e7b1e6ebf9746f34b610ca0508.tar.xz linux-fcb06702f023a0e7b1e6ebf9746f34b610ca0508.zip | |
Merge remote-tracking branch 'wireless/master' into mac80211
Diffstat (limited to 'net/bridge/br_multicast.c')
| -rw-r--r-- | net/bridge/br_multicast.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index b66581208cb2..241743417f49 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -540,10 +540,11 @@ static struct net_bridge_mdb_entry *br_multicast_get_group( if (mdb->size >= max) { max *= 2; - if (unlikely(max >= br->hash_max)) { - br_warn(br, "Multicast hash table maximum " - "reached, disabling snooping: %s, %d\n", - port ? port->dev->name : br->dev->name, max); + if (unlikely(max > br->hash_max)) { + br_warn(br, "Multicast hash table maximum of %d " + "reached, disabling snooping: %s\n", + br->hash_max, + port ? port->dev->name : br->dev->name); err = -E2BIG; disable: br->multicast_disabled = 1; @@ -1160,7 +1161,7 @@ static int br_ip6_multicast_query(struct net_bridge *br, goto out; } mld = (struct mld_msg *) icmp6_hdr(skb); - max_delay = msecs_to_jiffies(htons(mld->mld_maxdelay)); + max_delay = msecs_to_jiffies(ntohs(mld->mld_maxdelay)); if (max_delay) group = &mld->mld_mca; } else if (skb->len >= sizeof(*mld2q)) { |