From 619efe7e468f99b0ccc00c994b5bc62de1a53d81 Mon Sep 17 00:00:00 2001
From: Senthil Balasubramanian <senthilkumar@atheros.com>
Date: Tue, 30 Nov 2010 20:15:38 +0530
Subject: [PATCH] --- yaml --- r: 223196 b: refs/heads/master c:
 8e26d5ad2f9c038609d42eebc676cd1107709eef h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index baa2ed52b9b4..c1b4c82014d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c31333a8fde7e26936a9f5371d02ff12c490993
+refs/heads/master: 8e26d5ad2f9c038609d42eebc676cd1107709eef
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 3c87293cb078..54fb4a0e76f0 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -2745,6 +2745,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
 
 			if (ieee80211_prepare_and_rx_handle(&rx, skb, true))
 				return;
+			goto out;
 		}
 	}
 
@@ -2784,6 +2785,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
 			return;
 	}
 
+ out:
 	dev_kfree_skb(skb);
 }