diff options
Diffstat (limited to 'drivers/net/wireless/adm8211.c')
| -rw-r--r-- | drivers/net/wireless/adm8211.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index b96ebfe4ef3e..fc0897fb2239 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c | |||
| @@ -1297,22 +1297,6 @@ static void adm8211_set_bssid(struct ieee80211_hw *dev, const u8 *bssid) | |||
| 1297 | ADM8211_CSR_WRITE(ABDA1, reg); | 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 | static int adm8211_config(struct ieee80211_hw *dev, u32 changed) | 1300 | static int adm8211_config(struct ieee80211_hw *dev, u32 changed) |
| 1317 | { | 1301 | { |
| 1318 | struct adm8211_priv *priv = dev->priv; | 1302 | struct adm8211_priv *priv = dev->priv; |
| @@ -1338,13 +1322,6 @@ static int adm8211_config_interface(struct ieee80211_hw *dev, | |||
| 1338 | memcpy(priv->bssid, conf->bssid, ETH_ALEN); | 1322 | memcpy(priv->bssid, conf->bssid, ETH_ALEN); |
| 1339 | } | 1323 | } |
| 1340 | 1324 | ||
| 1341 | if (conf->ssid_len != priv->ssid_len || | ||
| 1342 | memcmp(conf->ssid, priv->ssid, conf->ssid_len)) { | ||
| 1343 | adm8211_set_ssid(dev, conf->ssid, conf->ssid_len); | ||
| 1344 | priv->ssid_len = conf->ssid_len; | ||
| 1345 | memcpy(priv->ssid, conf->ssid, conf->ssid_len); | ||
| 1346 | } | ||
| 1347 | |||
| 1348 | return 0; | 1325 | return 0; |
| 1349 | } | 1326 | } |
| 1350 | 1327 | ||
