---

yaml --- r: 341972 b: refs/heads/master c: 0624760 h: refs/heads/master v: v3
git-mirror · Nov 28, 2012 · 74293ce · 74293ce
1 parent e078789
commit 74293ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 		}
 	}