---

yaml --- r: 233068 b: refs/heads/master c: 4d048aa h: refs/heads/master v: v3
git-mirror · Feb 3, 2011 · f8a2cc3 · f8a2cc3
1 parent 4b22a69
commit f8a2cc3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);