---

yaml --- r: 115028 b: refs/heads/master c: d048e50 h: refs/heads/master v: v3
git-mirror · Oct 15, 2008 · a46bea4 · a46bea4
1 parent 2eda2b4
commit a46bea4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c25bab54fe30d26a2cddf7058d77da72be630b23
+refs/heads/master: d048e503a2b01e771ee87921c24d89d7ec3f0c2f
diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
@@ -388,7 +388,8 @@ ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,
 	bss = ieee80211_bss_info_update(sdata->local, rx_status,
 					mgmt, skb->len, &elems,
 					freq, beacon);
-	ieee80211_rx_bss_put(sdata->local, bss);
+	if (bss)
+		ieee80211_rx_bss_put(sdata->local, bss);
 
 	dev_kfree_skb(skb);
 	return RX_QUEUED;