diff options
| author | David S. Miller | 2008-07-15 05:23:54 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-07-15 05:23:54 +0200 |
| commit | 2aec609fb45e84d65bc8eabc7b650bbecb1cc179 (patch) | |
| tree | eb3e8a79604113392d0ee74b19dbc1dfce579c11 /drivers/net/wireless/zd1211rw | |
| parent | netfilter: Let nf_ct_kill() callers know if del_timer() returned true. (diff) | |
| parent | ARM: IXP4xx Ethernet NAPI fix (diff) | |
| download | kernel-qcow2-linux-2aec609fb45e84d65bc8eabc7b650bbecb1cc179.tar.gz kernel-qcow2-linux-2aec609fb45e84d65bc8eabc7b650bbecb1cc179.tar.xz kernel-qcow2-linux-2aec609fb45e84d65bc8eabc7b650bbecb1cc179.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/netfilter/nf_conntrack_proto_tcp.c
Diffstat (limited to 'drivers/net/wireless/zd1211rw')
| -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 665f76af2fec..feaf43d17249 100644 --- 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); } |