diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 17:47:44 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 17:47:44 +0900 |
commit | 9dd056e9eba106ef622795b566f769a9ab0a49a8 (patch) | |
tree | 390c07ea2c3b9631c2e8fe64c1a6feba0b503e8b /net/bridge/br_multicast.c | |
parent | 08ef2e427b59393d68a65b16e97e894b662a5573 (diff) | |
parent | f2b9726105824fdeea32a339e5072a358f89a25b (diff) | |
download | op-kernel-dev-9dd056e9eba106ef622795b566f769a9ab0a49a8.zip op-kernel-dev-9dd056e9eba106ef622795b566f769a9ab0a49a8.tar.gz |
Merge branch 'sh/stable-updates' into sh-latest
Diffstat (limited to 'net/bridge/br_multicast.c')
-rw-r--r-- | net/bridge/br_multicast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 2f14eaf..29b9812 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1424,7 +1424,7 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br, switch (ih->type) { case IGMP_HOST_MEMBERSHIP_REPORT: case IGMPV2_HOST_MEMBERSHIP_REPORT: - BR_INPUT_SKB_CB(skb2)->mrouters_only = 1; + BR_INPUT_SKB_CB(skb)->mrouters_only = 1; err = br_ip4_multicast_add_group(br, port, ih->group); break; case IGMPV3_HOST_MEMBERSHIP_REPORT: @@ -1543,7 +1543,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br, goto out; } mld = (struct mld_msg *)skb_transport_header(skb2); - BR_INPUT_SKB_CB(skb2)->mrouters_only = 1; + BR_INPUT_SKB_CB(skb)->mrouters_only = 1; err = br_ip6_multicast_add_group(br, port, &mld->mld_mca); break; } |