From f8a2cc33c56654f1f9aaf3dc0b1f1cd0630a160a Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Thu, 3 Feb 2011 21:14:01 +0100
Subject: [PATCH] --- yaml --- r: 233068 b: refs/heads/master c:
 4d048aac990d587c81fc1002e28502e6f95371ee h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/wireless/wl1251/main.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c41da5320acc..0ea16f8954c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4334ec8518cec3f7a4feeb3dacb46acfb24904d4
+refs/heads/master: 4d048aac990d587c81fc1002e28502e6f95371ee
diff --git a/trunk/drivers/net/wireless/wl1251/main.c b/trunk/drivers/net/wireless/wl1251/main.c
index 012e1a4016fe..40372bac9482 100644
--- a/trunk/drivers/net/wireless/wl1251/main.c
+++ b/trunk/drivers/net/wireless/wl1251/main.c
@@ -1039,6 +1039,9 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
 
 	if (changed & BSS_CHANGED_BEACON) {
 		beacon = ieee80211_beacon_get(hw, vif);
+		if (!beacon)
+			goto out_sleep;
+
 		ret = wl1251_cmd_template_set(wl, CMD_BEACON, beacon->data,
 					      beacon->len);