diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-02-27 02:05:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-27 02:05:54 -0800 |
| commit | ce300c7ffa61165f9bfd16e511ee0cd4114977ab (patch) | |
| tree | 874b57409bad0c9620a431272e6bf5c94e270253 /net | |
| parent | net: Delete isa-skeleton net driver (diff) | |
| parent | b43: fall back gracefully to PIO mode after fatal DMA errors (diff) | |
| download | linux-dev-ce300c7ffa61165f9bfd16e511ee0cd4114977ab.tar.xz linux-dev-ce300c7ffa61165f9bfd16e511ee0cd4114977ab.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/main.c | 6 | ||||
| -rw-r--r-- | net/mac80211/work.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index ec8f767ba95b..06c33b68d8e5 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -558,8 +558,12 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) debugfs_hw_add(local); + /* + * if the driver doesn't specify a max listen interval we + * use 5 which should be a safe default + */ if (local->hw.max_listen_interval == 0) - local->hw.max_listen_interval = 1; + local->hw.max_listen_interval = 5; local->hw.conf.listen_interval = local->hw.max_listen_interval; diff --git a/net/mac80211/work.c b/net/mac80211/work.c index 7e708d5c88b4..1e1ea3007b06 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c @@ -869,6 +869,7 @@ static void ieee80211_work_work(struct work_struct *work) break; case IEEE80211_WORK_ABORT: rma = WORK_ACT_TIMEOUT; + break; case IEEE80211_WORK_DIRECT_PROBE: rma = ieee80211_direct_probe(wk); break; |