diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-18 17:03:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-18 17:03:41 -0500 |
| commit | b67afe7f43afd2f5cd98798993561920c1684c12 (patch) | |
| tree | e45a0e41c91a1d199fd865b011ed0d25f5497bb9 /drivers/net/wireless/wl1251 | |
| parent | db28569adc692d9fb8a2d2d8e7ebab7fd5481f10 (diff) | |
| parent | 28bec7b845e10b68e6ba1ade5de0fc566690fc61 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c
Diffstat (limited to 'drivers/net/wireless/wl1251')
| -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 1c8b0775d84..5a1c13878ea 100644 --- a/drivers/net/wireless/wl1251/main.c +++ b/drivers/net/wireless/wl1251/main.c @@ -1050,6 +1050,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); |