Commit 87557c18 authored Feb 27, 2010 by Herbert Xu Committed by David S. Miller Feb 28, 2010

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>

parent 4181b2c8

net/bridge/br_input.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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:

Admin message