From 8baf895b352df86ad24bfc61896a2852d2cf4580 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 22 Dec 2010 10:15:07 +0100
Subject: [PATCH] --- yaml --- r: 223647 b: refs/heads/master c:
 b51aff057c9d0ef6c529dc25fd9f775faf7b6c63 h: refs/heads/master i:   223645:
 b87164ebe70e6a1187ae6f279e70bfd0925699df   223643:
 47d8f26152765faaf4ca77d64c8d118bf2117f86   223639:
 35d05ded03fe297f63c60218958a3f7310f918aa   223631:
 f81d59f973f23a8cf82ac161c883109ac66076ca   223615:
 9ad19a9daaafe95740817284479c083db44f7999 v: v3

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

diff --git a/[refs] b/[refs]
index 3472a5411c83..83e1ab7ea41f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2b7ab22fa2e619c20917e825c0da7212ca2efc9
+refs/heads/master: b51aff057c9d0ef6c529dc25fd9f775faf7b6c63
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 54fb4a0e76f0..b01e467b76c6 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1788,9 +1788,11 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 
 			fwd_skb = skb_copy(skb, GFP_ATOMIC);
 
-			if (!fwd_skb && net_ratelimit())
+			if (!fwd_skb && net_ratelimit()) {
 				printk(KERN_DEBUG "%s: failed to clone mesh frame\n",
 						   sdata->name);
+				goto out;
+			}
 
 			fwd_hdr =  (struct ieee80211_hdr *) fwd_skb->data;
 			memcpy(fwd_hdr->addr2, sdata->vif.addr, ETH_ALEN);
@@ -1828,6 +1830,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 		}
 	}
 
+ out:
 	if (is_multicast_ether_addr(hdr->addr1) ||
 	    sdata->dev->flags & IFF_PROMISC)
 		return RX_CONTINUE;