diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-15 18:56:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-15 18:56:47 -0500 |
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) | |||
165 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | 165 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); |
166 | struct ieee80211_if_init_conf conf; | 166 | struct ieee80211_if_init_conf conf; |
167 | int res; | 167 | int res; |
168 | bool need_hw_reconfig = 0; | ||
168 | 169 | ||
169 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 170 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
170 | 171 | ||
@@ -218,7 +219,7 @@ static int ieee80211_open(struct net_device *dev) | |||
218 | res = local->ops->start(local_to_hw(local)); | 219 | res = local->ops->start(local_to_hw(local)); |
219 | if (res) | 220 | if (res) |
220 | return res; | 221 | return res; |
221 | ieee80211_hw_config(local); | 222 | need_hw_reconfig = 1; |
222 | ieee80211_led_radio(local, local->hw.conf.radio_enabled); | 223 | ieee80211_led_radio(local, local->hw.conf.radio_enabled); |
223 | } | 224 | } |
224 | 225 | ||
@@ -282,6 +283,8 @@ static int ieee80211_open(struct net_device *dev) | |||
282 | atomic_inc(&local->iff_promiscs); | 283 | atomic_inc(&local->iff_promiscs); |
283 | 284 | ||
284 | local->open_count++; | 285 | local->open_count++; |
286 | if (need_hw_reconfig) | ||
287 | ieee80211_hw_config(local); | ||
285 | 288 | ||
286 | netif_start_queue(dev); | 289 | netif_start_queue(dev); |
287 | 290 | ||