b43/legacy: remove SSID code

The SSID programmed into the device is used by the ucode only
to reply to probe requests, a functionality we disable anyway
because it doesn't fit with the mac80211/hostapd programming
model. Therefore, it isn't useful to program the SSID into
device.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 2a599fb772d97b087444f61724315933311bff0e..9d1768d5fbad6029257b6d781b1ef3f0b89f27fb 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1674,25 +1674,6 @@ static void b43_update_templates(struct b43_wl *wl)
        queue_work(wl->hw->workqueue, &wl->beacon_update_trigger);
 }
 
-static void b43_set_ssid(struct b43_wldev *dev, const u8 * ssid, u8 ssid_len)
-{
-       u32 tmp;
-       u16 i, len;
-
-       len = min((u16) ssid_len, (u16) 0x100);
-       for (i = 0; i < len; i += sizeof(u32)) {
-               tmp = (u32) (ssid[i + 0]);
-               if (i + 1 < len)
-                       tmp |= (u32) (ssid[i + 1]) << 8;
-               if (i + 2 < len)
-                       tmp |= (u32) (ssid[i + 2]) << 16;
-               if (i + 3 < len)
-                       tmp |= (u32) (ssid[i + 3]) << 24;
-               b43_shm_write32(dev, B43_SHM_SHARED, 0x380 + i, tmp);
-       }
-       b43_shm_write16(dev, B43_SHM_SHARED, 0x48, len);
-}
-
 static void b43_set_beacon_int(struct b43_wldev *dev, u16 beacon_int)
 {
        b43_time_lock(dev);
@@ -3602,8 +3583,6 @@ static int b43_op_config_interface(struct ieee80211_hw *hw,
                if (b43_is_mode(wl, NL80211_IFTYPE_AP) ||
                    b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT)) {
                        B43_WARN_ON(vif->type != wl->if_type);
-                       if (conf->changed & IEEE80211_IFCC_SSID)
-                               b43_set_ssid(dev, conf->ssid, conf->ssid_len);
                        if (conf->changed & IEEE80211_IFCC_BEACON)
                                b43_update_templates(wl);
                } else if (b43_is_mode(wl, NL80211_IFTYPE_ADHOC)) {

diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 9edbdf9cb50fd7811dd8289511bd40e7c41d29b9..6c8eb4d2519ad5da678bc41e0bd88ccc6074f236 100644 (file)
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1160,29 +1160,6 @@ static void b43legacy_update_templates(struct b43legacy_wl *wl)
        wl->beacon1_uploaded = 0;
 }
 
-static void b43legacy_set_ssid(struct b43legacy_wldev *dev,
-                              const u8 *ssid, u8 ssid_len)
-{
-       u32 tmp;
-       u16 i;
-       u16 len;
-
-       len = min((u16)ssid_len, (u16)0x100);
-       for (i = 0; i < len; i += sizeof(u32)) {
-               tmp = (u32)(ssid[i + 0]);
-               if (i + 1 < len)
-                       tmp |= (u32)(ssid[i + 1]) << 8;
-               if (i + 2 < len)
-                       tmp |= (u32)(ssid[i + 2]) << 16;
-               if (i + 3 < len)
-                       tmp |= (u32)(ssid[i + 3]) << 24;
-               b43legacy_shm_write32(dev, B43legacy_SHM_SHARED,
-                                     0x380 + i, tmp);
-       }
-       b43legacy_shm_write16(dev, B43legacy_SHM_SHARED,
-                             0x48, len);
-}
-
 static void b43legacy_set_beacon_int(struct b43legacy_wldev *dev,
                                     u16 beacon_int)
 {
@@ -2744,7 +2721,6 @@ static int b43legacy_op_config_interface(struct ieee80211_hw *hw,
        if (b43legacy_status(dev) >= B43legacy_STAT_INITIALIZED) {
                if (b43legacy_is_mode(wl, NL80211_IFTYPE_AP)) {
                        B43legacy_WARN_ON(vif->type != NL80211_IFTYPE_AP);
-                       b43legacy_set_ssid(dev, conf->ssid, conf->ssid_len);
                        if (conf->changed & IEEE80211_IFCC_BEACON)
                                b43legacy_update_templates(wl);
                } else if (b43legacy_is_mode(wl, NL80211_IFTYPE_ADHOC)) {