From c63911f9809eb00f1349b94df4c7c831ab13bcb7 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 27 Feb 2010 19:41:39 +0000
Subject: [PATCH] --- yaml --- r: 184562 b: refs/heads/master c:
 87557c18ac36241b596984589a0889c5c4bf916c h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/bridge/br_input.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e1a7c3686e9a..024363377738 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4181b2c8bc29bb756ac1816678104b528377b656
+refs/heads/master: 87557c18ac36241b596984589a0889c5c4bf916c
diff --git a/trunk/net/bridge/br_input.c b/trunk/net/bridge/br_input.c
index 5ee1a3682bf2..9589937e1c0a 100644
--- a/trunk/net/bridge/br_input.c
+++ b/trunk/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: