From a46bea4c2bee1ca32a1f566cbc80857a0d218e3f Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Sat, 11 Oct 2008 03:29:55 +0300
Subject: [PATCH] --- yaml --- r: 115028 b: refs/heads/master c:
 d048e503a2b01e771ee87921c24d89d7ec3f0c2f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b9b57bb466d5..35dc71977d23 100644
--- 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
index 8e6685e7ae85..416bb41099f3 100644
--- 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;