From 74293ce9f47d0fe3464d86070362b878f5ea6e32 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 27 Nov 2012 20:31:19 +0300
Subject: [PATCH] --- yaml --- r: 341972 b: refs/heads/master c:
 0624760c96da3ffeaec8027a016475ae752d75e1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d61f1ea525f7..7859143aad9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9d8b01978f6510a262ddc4da3b3694d5b149cfe
+refs/heads/master: 0624760c96da3ffeaec8027a016475ae752d75e1
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 9b13b8b24245..db343fa8033c 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -49,7 +49,7 @@ static struct sk_buff *remove_monitor_info(struct ieee80211_local *local,
 			/* driver bug */
 			WARN_ON(1);
 			dev_kfree_skb(skb);
-			skb = NULL;
+			return NULL;
 		}
 	}