diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:56:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:56:24 -0400 |
| commit | fd5226a72694d1c0abe1cc39711a86f1754e637d (patch) | |
| tree | 1d90b27c392fb2ef9859f2652dee7640916ed806 /net/ieee80211/softmac/ieee80211softmac_module.c | |
| parent | aad61439e6a00bdb72cb649e11f6e166590c5f66 (diff) | |
| parent | 178e0cc5ff249965c6cfbd78b1af6a5e614d837c (diff) | |
| download | op-kernel-dev-fd5226a72694d1c0abe1cc39711a86f1754e637d.zip op-kernel-dev-fd5226a72694d1c0abe1cc39711a86f1754e637d.tar.gz | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_module.c')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_module.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c index be83bdc..6252be2 100644 --- a/net/ieee80211/softmac/ieee80211softmac_module.c +++ b/net/ieee80211/softmac/ieee80211softmac_module.c @@ -89,6 +89,8 @@ ieee80211softmac_clear_pending_work(struct ieee80211softmac_device *sm) ieee80211softmac_wait_for_scan(sm); spin_lock_irqsave(&sm->lock, flags); + sm->running = 0; + /* Free all pending assoc work items */ cancel_delayed_work(&sm->associnfo.work); @@ -204,6 +206,8 @@ void ieee80211softmac_start(struct net_device *dev) assert(0); if (mac->txrates_change) mac->txrates_change(dev, change, &oldrates); + + mac->running = 1; } EXPORT_SYMBOL_GPL(ieee80211softmac_start); |
