From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from he.sipsolutions.net ([78.46.109.217]:36055 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754177Ab0HYU6U (ORCPT ); Wed, 25 Aug 2010 16:58:20 -0400 Message-Id: <20100825205726.554487600@sipsolutions.net> Date: Wed, 25 Aug 2010 22:56:21 +0200 From: Johannes Berg To: linux-wireless@vger.kernel.org Cc: Johannes Berg Subject: [RFC 2/6] mac80211: switch to ieee80211_sdata_running References: <20100825205619.152295081@sipsolutions.net> Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Johannes Berg Since the introduction of ieee80211_sdata_running(), some new code was introduced that uses netif_running() instead. Switch all these instances over. Signed-off-by: Johannes Berg --- net/mac80211/cfg.c | 6 ++---- net/mac80211/main.c | 6 +++--- net/mac80211/util.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) --- wireless-testing.orig/net/mac80211/cfg.c 2010-08-25 21:59:45.000000000 +0200 +++ wireless-testing/net/mac80211/cfg.c 2010-08-25 22:01:07.000000000 +0200 @@ -81,16 +81,14 @@ static int ieee80211_add_key(struct wiph u8 key_idx, const u8 *mac_addr, struct key_params *params) { - struct ieee80211_sub_if_data *sdata; + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct sta_info *sta = NULL; struct ieee80211_key *key; int err; - if (!netif_running(dev)) + if (!ieee80211_sdata_running(sdata)) return -ENETDOWN; - sdata = IEEE80211_DEV_TO_SUB_IF(dev); - /* reject WEP and TKIP keys if WEP failed to initialize */ switch (params->cipher) { case WLAN_CIPHER_SUITE_WEP40: --- wireless-testing.orig/net/mac80211/main.c 2010-08-25 21:59:57.000000000 +0200 +++ wireless-testing/net/mac80211/main.c 2010-08-25 22:01:25.000000000 +0200 @@ -339,9 +339,6 @@ static int ieee80211_ifa_changed(struct struct ieee80211_if_managed *ifmgd; int c = 0; - if (!netif_running(ndev)) - return NOTIFY_DONE; - /* Make sure it's our interface that got changed */ if (!wdev) return NOTIFY_DONE; @@ -352,6 +349,9 @@ static int ieee80211_ifa_changed(struct sdata = IEEE80211_DEV_TO_SUB_IF(ndev); bss_conf = &sdata->vif.bss_conf; + if (!ieee80211_sdata_running(sdata)) + return NOTIFY_DONE; + /* ARP filtering is only supported in managed mode */ if (sdata->vif.type != NL80211_IFTYPE_STATION) return NOTIFY_DONE; --- wireless-testing.orig/net/mac80211/util.c 2010-08-25 22:00:15.000000000 +0200 +++ wireless-testing/net/mac80211/util.c 2010-08-25 22:00:28.000000000 +0200 @@ -1308,7 +1308,7 @@ void ieee80211_recalc_smps(struct ieee80 */ list_for_each_entry(sdata, &local->interfaces, list) { - if (!netif_running(sdata->dev)) + if (!ieee80211_sdata_running(sdata)) continue; if (sdata->vif.type != NL80211_IFTYPE_STATION) goto set;