diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-15 15:56:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-15 15:56:47 -0800 |
| commit | 42fe95cae50bbea4c83b15962b853d6d3b14db37 (patch) | |
| tree | 08b8ce6c26fbfd63d03d84caf5843a503a2c9a24 /net | |
| parent | 997b37da1515c1620692521786a74af271664eb7 (diff) | |
| parent | 6fff1c64ffd899e0b70fbb0201c6603f078ea942 (diff) | |
Merge branch 'fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/ieee80211.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 67b7c75c430d..28bcdf9fc3df 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c @@ -165,6 +165,7 @@ static int ieee80211_open(struct net_device *dev) struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); struct ieee80211_if_init_conf conf; int res; + bool need_hw_reconfig = 0; sdata = IEEE80211_DEV_TO_SUB_IF(dev); @@ -218,7 +219,7 @@ static int ieee80211_open(struct net_device *dev) res = local->ops->start(local_to_hw(local)); if (res) return res; - ieee80211_hw_config(local); + need_hw_reconfig = 1; ieee80211_led_radio(local, local->hw.conf.radio_enabled); } @@ -282,6 +283,8 @@ static int ieee80211_open(struct net_device *dev) atomic_inc(&local->iff_promiscs); local->open_count++; + if (need_hw_reconfig) + ieee80211_hw_config(local); netif_start_queue(dev); |