diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-09 15:10:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-09 15:10:09 -0700 |
| commit | 2ddddb98694af847f70463dbdc69aa491d9f477a (patch) | |
| tree | c4115467a95e9e1dbce3e71934eecb1168bc90bb /drivers/net/wireless/zd1211rw/zd_mac.c | |
| parent | 252815b0cfe711001eff0327872209986b36d490 (diff) | |
| parent | 814feefa859a736d29d0700d49debf13904b429f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_mac.c')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 418606ac1c3..694e95d35fd 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c @@ -765,6 +765,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); } |