---

yaml --- r: 184562 b: refs/heads/master c: 87557c1 h: refs/heads/master v: v3
git-mirror · Feb 28, 2010 · c63911f · c63911f
1 parent 40291d5
commit c63911f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -73,16 +73,16 @@ 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);
 		else
 			br_flood_forward(br, skb);
 	}
 
+	if (skb2)
+		br_pass_frame_up(br, skb2);
+
 out:
 	return 0;
 drop: