diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-12 16:18:44 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-12 16:18:44 -0400 |
| commit | 252f4bf400df1712408fe83ba199a66a1b57ab1d (patch) | |
| tree | e07fa00abdd55b31e22567786c78635f32c6a66c /net/mac80211/util.c | |
| parent | 6ba1037c3d871ab70e342631516dbf841c35b086 (diff) | |
| parent | b37e3b6d64358604960b35e8ecbb7aed22e0926e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/ath/ar9170/phy.c
drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 556647a910a..ef0560a2346 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
| @@ -1290,7 +1290,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) | |||
| 1290 | } | 1290 | } |
| 1291 | } | 1291 | } |
| 1292 | 1292 | ||
| 1293 | add_timer(&local->sta_cleanup); | 1293 | mod_timer(&local->sta_cleanup, jiffies + 1); |
| 1294 | 1294 | ||
| 1295 | mutex_lock(&local->sta_mtx); | 1295 | mutex_lock(&local->sta_mtx); |
| 1296 | list_for_each_entry(sta, &local->sta_list, list) | 1296 | list_for_each_entry(sta, &local->sta_list, list) |