aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-28 13:29:48 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-11-10 15:11:56 -0500
commit71c11fb57b924c160297ccd9e1761db598d00ac2 (patch)
tree3722436b2d390767e76b6d476fd44e27c3362a36 /drivers/net/wireless
parent4607816f608b42a5379aca97ceed08378804c99f (diff)
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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/b43/main.c21
-rw-r--r--drivers/net/wireless/b43legacy/main.c24
2 files changed, 0 insertions, 45 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 2a599fb772d9..9d1768d5fbad 100644
--- 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)
1674 queue_work(wl->hw->workqueue, &wl->beacon_update_trigger); 1674 queue_work(wl->hw->workqueue, &wl->beacon_update_trigger);
1675} 1675}
1676 1676
1677static void b43_set_ssid(struct b43_wldev *dev, const u8 * ssid, u8 ssid_len)
1678{
1679 u32 tmp;
1680 u16 i, len;
1681
1682 len = min((u16) ssid_len, (u16) 0x100);
1683 for (i = 0; i < len; i += sizeof(u32)) {
1684 tmp = (u32) (ssid[i + 0]);
1685 if (i + 1 < len)
1686 tmp |= (u32) (ssid[i + 1]) << 8;
1687 if (i + 2 < len)
1688 tmp |= (u32) (ssid[i + 2]) << 16;
1689 if (i + 3 < len)
1690 tmp |= (u32) (ssid[i + 3]) << 24;
1691 b43_shm_write32(dev, B43_SHM_SHARED, 0x380 + i, tmp);
1692 }
1693 b43_shm_write16(dev, B43_SHM_SHARED, 0x48, len);
1694}
1695
1696static void b43_set_beacon_int(struct b43_wldev *dev, u16 beacon_int) 1677static void b43_set_beacon_int(struct b43_wldev *dev, u16 beacon_int)
1697{ 1678{
1698 b43_time_lock(dev); 1679 b43_time_lock(dev);
@@ -3602,8 +3583,6 @@ static int b43_op_config_interface(struct ieee80211_hw *hw,
3602 if (b43_is_mode(wl, NL80211_IFTYPE_AP) || 3583 if (b43_is_mode(wl, NL80211_IFTYPE_AP) ||
3603 b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT)) { 3584 b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT)) {
3604 B43_WARN_ON(vif->type != wl->if_type); 3585 B43_WARN_ON(vif->type != wl->if_type);
3605 if (conf->changed & IEEE80211_IFCC_SSID)
3606 b43_set_ssid(dev, conf->ssid, conf->ssid_len);
3607 if (conf->changed & IEEE80211_IFCC_BEACON) 3586 if (conf->changed & IEEE80211_IFCC_BEACON)
3608 b43_update_templates(wl); 3587 b43_update_templates(wl);
3609 } else if (b43_is_mode(wl, NL80211_IFTYPE_ADHOC)) { 3588 } 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 9edbdf9cb50f..6c8eb4d2519a 100644
--- 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)
1160 wl->beacon1_uploaded = 0; 1160 wl->beacon1_uploaded = 0;
1161} 1161}
1162 1162
1163static void b43legacy_set_ssid(struct b43legacy_wldev *dev,
1164 const u8 *ssid, u8 ssid_len)
1165{
1166 u32 tmp;
1167 u16 i;
1168 u16 len;
1169
1170 len = min((u16)ssid_len, (u16)0x100);
1171 for (i = 0; i < len; i += sizeof(u32)) {
1172 tmp = (u32)(ssid[i + 0]);
1173 if (i + 1 < len)
1174 tmp |= (u32)(ssid[i + 1]) << 8;
1175 if (i + 2 < len)
1176 tmp |= (u32)(ssid[i + 2]) << 16;
1177 if (i + 3 < len)
1178 tmp |= (u32)(ssid[i + 3]) << 24;
1179 b43legacy_shm_write32(dev, B43legacy_SHM_SHARED,
1180 0x380 + i, tmp);
1181 }
1182 b43legacy_shm_write16(dev, B43legacy_SHM_SHARED,
1183 0x48, len);
1184}
1185
1186static void b43legacy_set_beacon_int(struct b43legacy_wldev *dev, 1163static void b43legacy_set_beacon_int(struct b43legacy_wldev *dev,
1187 u16 beacon_int) 1164 u16 beacon_int)
1188{ 1165{
@@ -2744,7 +2721,6 @@ static int b43legacy_op_config_interface(struct ieee80211_hw *hw,
2744 if (b43legacy_status(dev) >= B43legacy_STAT_INITIALIZED) { 2721 if (b43legacy_status(dev) >= B43legacy_STAT_INITIALIZED) {
2745 if (b43legacy_is_mode(wl, NL80211_IFTYPE_AP)) { 2722 if (b43legacy_is_mode(wl, NL80211_IFTYPE_AP)) {
2746 B43legacy_WARN_ON(vif->type != NL80211_IFTYPE_AP); 2723 B43legacy_WARN_ON(vif->type != NL80211_IFTYPE_AP);
2747 b43legacy_set_ssid(dev, conf->ssid, conf->ssid_len);
2748 if (conf->changed & IEEE80211_IFCC_BEACON) 2724 if (conf->changed & IEEE80211_IFCC_BEACON)
2749 b43legacy_update_templates(wl); 2725 b43legacy_update_templates(wl);
2750 } else if (b43legacy_is_mode(wl, NL80211_IFTYPE_ADHOC)) { 2726 } else if (b43legacy_is_mode(wl, NL80211_IFTYPE_ADHOC)) {