diff --git a/[refs] b/[refs] index eca59540b50d..90f9bda67459 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: caf66e581172dc5032bb84841a91bc7b77ad9876 +refs/heads/master: 0e0a228398cc967c922759be36c69d32e4f62701 diff --git a/trunk/net/mac80211/work.c b/trunk/net/mac80211/work.c index 7e708d5c88b4..1e1ea3007b06 100644 --- a/trunk/net/mac80211/work.c +++ b/trunk/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;