diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-08 12:03:54 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-08 12:03:54 -0800 |
commit | e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0 (patch) | |
tree | a0261a4fae2b2e288cbc7e14a8f1acd47d4f2df4 /drivers/net/wireless/wl1251/main.c | |
parent | 429a01a70f301baf0c8fc780f891a18c296d5e24 (diff) | |
parent | fc7c976dc7a565213393ce700d4a6105f037bf20 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/wl1251/main.c')
-rw-r--r-- | drivers/net/wireless/wl1251/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/wl1251/main.c index 012e1a4016f..40372bac948 100644 --- a/drivers/net/wireless/wl1251/main.c +++ b/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); |