[MAC80211]: Check open_count before calling config callback.

Also remove the check for ops->config!=NULL, as it can never be NULL.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 210319f9ea2f5318e11d41483a7d34971b135f17..62877a8f9f0f7ee2a51b57e5ef555632f1012ef1 100644 (file)
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -678,7 +678,7 @@ int ieee80211_hw_config(struct ieee80211_local *local)
               local->hw.conf.phymode);
 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
 
               local->hw.conf.phymode);
 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
 

-       if (local->ops->config)
+       if (local->open_count)

                ret = local->ops->config(local_to_hw(local), &local->hw.conf);
 
        return ret;
                ret = local->ops->config(local_to_hw(local), &local->hw.conf);
 
        return ret;