diff options
-rw-r--r-- | net/bridge/br_multicast.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 38d1fbde5fb8..e481dbd19495 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c | |||
@@ -1340,9 +1340,6 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br, | |||
1340 | unsigned offset; | 1340 | unsigned offset; |
1341 | int err; | 1341 | int err; |
1342 | 1342 | ||
1343 | BR_INPUT_SKB_CB(skb)->igmp = 0; | ||
1344 | BR_INPUT_SKB_CB(skb)->mrouters_only = 0; | ||
1345 | |||
1346 | /* We treat OOM as packet loss for now. */ | 1343 | /* We treat OOM as packet loss for now. */ |
1347 | if (!pskb_may_pull(skb, sizeof(*iph))) | 1344 | if (!pskb_may_pull(skb, sizeof(*iph))) |
1348 | return -EINVAL; | 1345 | return -EINVAL; |
@@ -1440,9 +1437,6 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br, | |||
1440 | unsigned offset; | 1437 | unsigned offset; |
1441 | int err; | 1438 | int err; |
1442 | 1439 | ||
1443 | BR_INPUT_SKB_CB(skb)->igmp = 0; | ||
1444 | BR_INPUT_SKB_CB(skb)->mrouters_only = 0; | ||
1445 | |||
1446 | if (!pskb_may_pull(skb, sizeof(*ip6h))) | 1440 | if (!pskb_may_pull(skb, sizeof(*ip6h))) |
1447 | return -EINVAL; | 1441 | return -EINVAL; |
1448 | 1442 | ||
@@ -1550,6 +1544,9 @@ out: | |||
1550 | int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port, | 1544 | int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port, |
1551 | struct sk_buff *skb) | 1545 | struct sk_buff *skb) |
1552 | { | 1546 | { |
1547 | BR_INPUT_SKB_CB(skb)->igmp = 0; | ||
1548 | BR_INPUT_SKB_CB(skb)->mrouters_only = 0; | ||
1549 | |||
1553 | if (br->multicast_disabled) | 1550 | if (br->multicast_disabled) |
1554 | return 0; | 1551 | return 0; |
1555 | 1552 | ||