Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2 files changed, 6 insertions, 1 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index ec8f767ba95..06c33b68d8e 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 7e708d5c88b..1e1ea3007b0 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;