diff options
| author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2010-03-15 21:51:18 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-16 14:34:23 -0700 |
| commit | 32dec5dd0233ebffa9cae25ce7ba6daeb7df4467 (patch) | |
| tree | b086e355e9afa2cb6ab51988175afd619787029b /net/bridge/br_device.c | |
| parent | 858a18a6a2f74e8f0e5b2e9671d4b74694aba708 (diff) | |
| download | kernel_samsung_smdk4412-32dec5dd0233ebffa9cae25ce7ba6daeb7df4467.zip kernel_samsung_smdk4412-32dec5dd0233ebffa9cae25ce7ba6daeb7df4467.tar.gz kernel_samsung_smdk4412-32dec5dd0233ebffa9cae25ce7ba6daeb7df4467.tar.bz2 | |
bridge br_multicast: Don't refer to BR_INPUT_SKB_CB(skb)->mrouters_only without IGMP snooping.
Without CONFIG_BRIDGE_IGMP_SNOOPING,
BR_INPUT_SKB_CB(skb)->mrouters_only is not appropriately
initialized, so we can see garbage.
A clear option to fix this is to set it even without that
config, but we cannot optimize out the branch.
Let's introduce a macro that returns value of mrouters_only
and let it return 0 without CONFIG_BRIDGE_IGMP_SNOOPING.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_device.c')
| -rw-r--r-- | net/bridge/br_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index eb7062d..90a9024 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -40,7 +40,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) goto out; mdst = br_mdb_get(br, skb); - if (mdst || BR_INPUT_SKB_CB(skb)->mrouters_only) + if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) br_multicast_deliver(mdst, skb); else br_flood_deliver(br, skb); |