mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
71c11fb57b
commit
b23f99bcfa
|
@ -1297,22 +1297,6 @@ static void adm8211_set_bssid(struct ieee80211_hw *dev, const u8 *bssid)
|
|||
ADM8211_CSR_WRITE(ABDA1, reg);
|
||||
}
|
||||
|
||||
static int adm8211_set_ssid(struct ieee80211_hw *dev, u8 *ssid, size_t ssid_len)
|
||||
{
|
||||
struct adm8211_priv *priv = dev->priv;
|
||||
u8 buf[36];
|
||||
|
||||
if (ssid_len > 32)
|
||||
return -EINVAL;
|
||||
|
||||
memset(buf, 0, sizeof(buf));
|
||||
buf[0] = ssid_len;
|
||||
memcpy(buf + 1, ssid, ssid_len);
|
||||
adm8211_write_sram_bytes(dev, ADM8211_SRAM_SSID, buf, 33);
|
||||
/* TODO: configure beacon for adhoc? */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int adm8211_config(struct ieee80211_hw *dev, u32 changed)
|
||||
{
|
||||
struct adm8211_priv *priv = dev->priv;
|
||||
|
@ -1338,13 +1322,6 @@ static int adm8211_config_interface(struct ieee80211_hw *dev,
|
|||
memcpy(priv->bssid, conf->bssid, ETH_ALEN);
|
||||
}
|
||||
|
||||
if (conf->ssid_len != priv->ssid_len ||
|
||||
memcmp(conf->ssid, priv->ssid, conf->ssid_len)) {
|
||||
adm8211_set_ssid(dev, conf->ssid, conf->ssid_len);
|
||||
priv->ssid_len = conf->ssid_len;
|
||||
memcpy(priv->ssid, conf->ssid, conf->ssid_len);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -553,8 +553,6 @@ struct adm8211_priv {
|
|||
|
||||
int channel;
|
||||
u8 bssid[ETH_ALEN];
|
||||
u8 ssid[32];
|
||||
size_t ssid_len;
|
||||
|
||||
u8 soft_rx_crc;
|
||||
u8 retry_limit;
|
||||
|
|
Loading…
Reference in New Issue