diff options
| author | James Morris <jmorris@namei.org> | 2010-03-30 17:39:27 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-03-30 17:39:27 -0400 |
| commit | d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec (patch) | |
| tree | 7362b182dedd825fc762ef7706830837e42943af /net/bridge/br_input.c | |
| parent | 225a9be24d799aa16d543c31fb09f0c9ed1d9caa (diff) | |
| parent | 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'net/bridge/br_input.c')
| -rw-r--r-- | net/bridge/br_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 53b39851d87d..d74d570fc848 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c | |||
| @@ -70,7 +70,7 @@ int br_handle_frame_finish(struct sk_buff *skb) | |||
| 70 | 70 | ||
| 71 | if (is_multicast_ether_addr(dest)) { | 71 | if (is_multicast_ether_addr(dest)) { |
| 72 | mdst = br_mdb_get(br, skb); | 72 | mdst = br_mdb_get(br, skb); |
| 73 | if (mdst || BR_INPUT_SKB_CB(skb)->mrouters_only) { | 73 | if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) { |
| 74 | if ((mdst && !hlist_unhashed(&mdst->mglist)) || | 74 | if ((mdst && !hlist_unhashed(&mdst->mglist)) || |
| 75 | br_multicast_is_router(br)) | 75 | br_multicast_is_router(br)) |
| 76 | skb2 = skb; | 76 | skb2 = skb; |
| @@ -90,7 +90,7 @@ int br_handle_frame_finish(struct sk_buff *skb) | |||
| 90 | 90 | ||
| 91 | if (skb) { | 91 | if (skb) { |
| 92 | if (dst) | 92 | if (dst) |
| 93 | br_forward(dst->dst, skb); | 93 | br_forward(dst->dst, skb, skb2); |
| 94 | else | 94 | else |
| 95 | br_flood_forward(br, skb, skb2); | 95 | br_flood_forward(br, skb, skb2); |
| 96 | } | 96 | } |