aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-28 20:09:37 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-11-10 15:11:56 -0500
commit41bb73eeac5ff5fb217257ba33b654747b3abf11 (patch)
tree766ebc2b0da42bb30abbc59ec9a2dd4e43f7a825 /drivers/net/wireless/iwlwifi
parentb23f99bcfa12c7b452f7ad201ea5921534d4e9ff (diff)
mac80211: remove SSID driver code
Remove the SSID from the driver API since now there is no driver that requires knowing the SSID and I think it's unlikely that any hardware design that does require the SSID will play well with mac80211. This also removes support for setting the SSID in master mode which will require a patch to hostapd to not try. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c7
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c7
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index ce3141f07f35..ad186e134dec 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2957,13 +2957,6 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
2957 return rc; 2957 return rc;
2958 } 2958 }
2959 2959
2960 if ((priv->iw_mode == NL80211_IFTYPE_AP) &&
2961 (!conf->ssid_len)) {
2962 IWL_DEBUG_MAC80211
2963 ("Leaving in AP mode because HostAPD is not ready.\n");
2964 return 0;
2965 }
2966
2967 if (!iwl_is_alive(priv)) 2960 if (!iwl_is_alive(priv))
2968 return -EAGAIN; 2961 return -EAGAIN;
2969 2962
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 0c2d778a9ff7..47881be9ba44 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6743,13 +6743,6 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
6743 6743
6744 /* XXX: this MUST use conf->mac_addr */ 6744 /* XXX: this MUST use conf->mac_addr */
6745 6745
6746 if ((priv->iw_mode == NL80211_IFTYPE_AP) &&
6747 (!conf->ssid_len)) {
6748 IWL_DEBUG_MAC80211
6749 ("Leaving in AP mode because HostAPD is not ready.\n");
6750 return 0;
6751 }
6752
6753 if (!iwl3945_is_alive(priv)) 6746 if (!iwl3945_is_alive(priv))
6754 return -EAGAIN; 6747 return -EAGAIN;
6755 6748