aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211.c
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2007-09-24 12:41:49 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:54:14 -0400
commitf7c4daed99fba15e4e48df464031f4ac7c32e4c9 (patch)
treebc696ea937c08b83a414d5572bac422f84a468cf /net/mac80211/ieee80211.c
parent05b64b364822863974c0121359b01d7ba0f22205 (diff)
[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>
Diffstat (limited to 'net/mac80211/ieee80211.c')
-rw-r--r--net/mac80211/ieee80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 210319f9ea2f..62877a8f9f0f 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -678,7 +678,7 @@ int ieee80211_hw_config(struct ieee80211_local *local)
678 local->hw.conf.phymode); 678 local->hw.conf.phymode);
679#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ 679#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
680 680
681 if (local->ops->config) 681 if (local->open_count)
682 ret = local->ops->config(local_to_hw(local), &local->hw.conf); 682 ret = local->ops->config(local_to_hw(local), &local->hw.conf);
683 683
684 return ret; 684 return ret;