Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

adm8211: remove SSID code

Since adm8211 currently doesn't implement IBSS mode anyway,
it can't be using the SSID. And if/when it does implement
IBSS mode, we'll have to see how to make it beacon anyway.

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

authored by

Johannes Berg and committed by
John W. Linville
b23f99bc 71c11fb5

-25
-23
drivers/net/wireless/adm8211.c
··· 1297 1297 ADM8211_CSR_WRITE(ABDA1, reg); 1298 1298 } 1299 1299 1300 - static int adm8211_set_ssid(struct ieee80211_hw *dev, u8 *ssid, size_t ssid_len) 1301 - { 1302 - struct adm8211_priv *priv = dev->priv; 1303 - u8 buf[36]; 1304 - 1305 - if (ssid_len > 32) 1306 - return -EINVAL; 1307 - 1308 - memset(buf, 0, sizeof(buf)); 1309 - buf[0] = ssid_len; 1310 - memcpy(buf + 1, ssid, ssid_len); 1311 - adm8211_write_sram_bytes(dev, ADM8211_SRAM_SSID, buf, 33); 1312 - /* TODO: configure beacon for adhoc? */ 1313 - return 0; 1314 - } 1315 - 1316 1300 static int adm8211_config(struct ieee80211_hw *dev, u32 changed) 1317 1301 { 1318 1302 struct adm8211_priv *priv = dev->priv; ··· 1320 1336 if (memcmp(conf->bssid, priv->bssid, ETH_ALEN)) { 1321 1337 adm8211_set_bssid(dev, conf->bssid); 1322 1338 memcpy(priv->bssid, conf->bssid, ETH_ALEN); 1323 - } 1324 - 1325 - if (conf->ssid_len != priv->ssid_len || 1326 - memcmp(conf->ssid, priv->ssid, conf->ssid_len)) { 1327 - adm8211_set_ssid(dev, conf->ssid, conf->ssid_len); 1328 - priv->ssid_len = conf->ssid_len; 1329 - memcpy(priv->ssid, conf->ssid, conf->ssid_len); 1330 1339 } 1331 1340 1332 1341 return 0;
-2
drivers/net/wireless/adm8211.h
··· 553 553 554 554 int channel; 555 555 u8 bssid[ETH_ALEN]; 556 - u8 ssid[32]; 557 - size_t ssid_len; 558 556 559 557 u8 soft_rx_crc; 560 558 u8 retry_limit;