From b99beedbe9d116f5b2e9223084e501a4c2634ed4 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 27 Jul 2007 15:43:22 +0200
Subject: [PATCH] --- yaml --- r: 66223 b: refs/heads/master c:
 340e11f332c695c43f506e82b1d39d00716c5005 h: refs/heads/master i:   66221:
 1ae0f84334ca068268d0e6e7fdd462eec40b729e   66219:
 fb8b63be7f32ce8b11051ba14b6d218b071f2749   66215:
 239cbc5a5266154f677e6f708c9baceadc7aab80   66207:
 09752840430675624f0936d28429772dd8e83901 v: v3

---
 [refs]                  |  2 +-
 trunk/net/mac80211/rx.c | 42 +++++++++++++++++++++++++++--------------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 873954cf9751..53f1c87d4667 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52865dfd520ddd3d1176947106759ff944f0f8af
+refs/heads/master: 340e11f332c695c43f506e82b1d39d00716c5005
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index f255579dc564..95a00eb57249 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1387,21 +1387,35 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
 		if (!prepres)
 			continue;
 
-		if (prev) {
-			skb_new = skb_copy(skb, GFP_ATOMIC);
-			if (!skb_new) {
-				if (net_ratelimit())
-					printk(KERN_DEBUG "%s: failed to copy "
-					       "multicast frame for %s",
-					       local->mdev->name, prev->dev->name);
-				continue;
-			}
-			rx.skb = skb_new;
-			rx.dev = prev->dev;
-			rx.sdata = prev;
-			ieee80211_invoke_rx_handlers(local, local->rx_handlers,
-						     &rx, sta);
+		/*
+		 * frame is destined for this interface, but if it's not
+		 * also for the previous one we handle that after the
+		 * loop to avoid copying the SKB once too much
+		 */
+
+		if (!prev) {
+			prev = sdata;
+			continue;
 		}
+
+		/*
+		 * frame was destined for the previous interface
+		 * so invoke RX handlers for it
+		 */
+
+		skb_new = skb_copy(skb, GFP_ATOMIC);
+		if (!skb_new) {
+			if (net_ratelimit())
+				printk(KERN_DEBUG "%s: failed to copy "
+				       "multicast frame for %s",
+				       local->mdev->name, prev->dev->name);
+			continue;
+		}
+		rx.skb = skb_new;
+		rx.dev = prev->dev;
+		rx.sdata = prev;
+		ieee80211_invoke_rx_handlers(local, local->rx_handlers,
+					     &rx, sta);
 		prev = sdata;
 	}
 	if (prev) {