From: Michael Buesch <mb@bu3sch.de>
Date: Mon, 24 Sep 2007 16:41:49 +0000 (+0200)
Subject: [MAC80211]: Check open_count before calling config callback.
X-Git-Tag: v2.6.24-rc1~1454^2~200
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7c4daed99fba15e4e48df464031f4ac7c32e4c9;p=linux-2.6

[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 210319f9ea..62877a8f9f 100644
--- 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 */
 
-	if (local->ops->config)
+	if (local->open_count)
 		ret = local->ops->config(local_to_hw(local), &local->hw.conf);
 
 	return ret;