projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
zd1211rw
/
zd_mac.c
diff --git
a/drivers/net/wireless/zd1211rw/zd_mac.c
b/drivers/net/wireless/zd1211rw/zd_mac.c
index 665f76af2fec134fcb53bad523dfee7593362088..feaf43d172498590f20b6cef32d29f9baae7cbcc 100644
(file)
--- a/
drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/
drivers/net/wireless/zd1211rw/zd_mac.c
@@
-707,6
+707,7
@@
static void zd_op_remove_interface(struct ieee80211_hw *hw,
{
struct zd_mac *mac = zd_hw_mac(hw);
mac->type = IEEE80211_IF_TYPE_INVALID;
+ zd_set_beacon_interval(&mac->chip, 0);
zd_write_mac_addr(&mac->chip, NULL);
}