From dba6b6849c6ad7c52163fcf3f3a6c160e99f1103 Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Sun, 10 Feb 2008 14:16:52 +0100 Subject: [PATCH] --- yaml --- r: 85801 b: refs/heads/master c: ceffefd15aac78841432230627308b8a382dbcfc h: refs/heads/master i: 85799: a834090258496f1d2391ce6a81b1d8890f5ccbbd v: v3 --- [refs] | 2 +- trunk/net/mac80211/ieee80211.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ba2d73473daa..23bc22a9afd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db433febbadaf1fa9862fb5068b119be1d312d76 +refs/heads/master: ceffefd15aac78841432230627308b8a382dbcfc diff --git a/trunk/net/mac80211/ieee80211.c b/trunk/net/mac80211/ieee80211.c index 67b7c75c430d..28bcdf9fc3df 100644 --- a/trunk/net/mac80211/ieee80211.c +++ b/trunk/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);