diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-02-27 19:41:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 00:48:42 -0800 |
| commit | 87557c18ac36241b596984589a0889c5c4bf916c (patch) | |
| tree | df4fc6baad28e65e29cfdc8ffc258d665d9119da /net | |
| parent | 4181b2c8bc29bb756ac1816678104b528377b656 (diff) | |
| download | linux-3.10-87557c18ac36241b596984589a0889c5c4bf916c.tar.gz linux-3.10-87557c18ac36241b596984589a0889c5c4bf916c.tar.bz2 linux-3.10-87557c18ac36241b596984589a0889c5c4bf916c.zip | |
bridge: Do br_pass_frame_up after other ports
At the moment we deliver to the local bridge port via the function
br_pass_frame_up before all other ports. There is no requirement
for this.
For the purpose of IGMP snooping, it would be more convenient if
we did the local port last. Therefore this patch rearranges the
bridge input processing so that the local bridge port gets to see
the packet last (if at all).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 5ee1a3682bf..9589937e1c0 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -73,9 +73,6 @@ int br_handle_frame_finish(struct sk_buff *skb) if (skb2 == skb) skb2 = skb_clone(skb, GFP_ATOMIC); - if (skb2) - br_pass_frame_up(br, skb2); - if (skb) { if (dst) br_forward(dst->dst, skb); @@ -83,6 +80,9 @@ int br_handle_frame_finish(struct sk_buff *skb) br_flood_forward(br, skb); } + if (skb2) + br_pass_frame_up(br, skb2); + out: return 0; drop: |