rtl8180: use RTL818X_MSR_ADHOC for IBSS connection
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
030725d2c7
Коммит
0f956e7107
|
@ -790,6 +790,7 @@ static void rtl8180_bss_info_changed(struct ieee80211_hw *dev,
|
||||||
struct rtl8180_priv *priv = dev->priv;
|
struct rtl8180_priv *priv = dev->priv;
|
||||||
struct rtl8180_vif *vif_priv;
|
struct rtl8180_vif *vif_priv;
|
||||||
int i;
|
int i;
|
||||||
|
u8 reg;
|
||||||
|
|
||||||
vif_priv = (struct rtl8180_vif *)&vif->drv_priv;
|
vif_priv = (struct rtl8180_vif *)&vif->drv_priv;
|
||||||
|
|
||||||
|
@ -798,12 +799,14 @@ static void rtl8180_bss_info_changed(struct ieee80211_hw *dev,
|
||||||
rtl818x_iowrite8(priv, &priv->map->BSSID[i],
|
rtl818x_iowrite8(priv, &priv->map->BSSID[i],
|
||||||
info->bssid[i]);
|
info->bssid[i]);
|
||||||
|
|
||||||
if (is_valid_ether_addr(info->bssid))
|
if (is_valid_ether_addr(info->bssid)) {
|
||||||
rtl818x_iowrite8(priv, &priv->map->MSR,
|
if (vif->type == NL80211_IFTYPE_ADHOC)
|
||||||
RTL818X_MSR_INFRA);
|
reg = RTL818X_MSR_ADHOC;
|
||||||
else
|
else
|
||||||
rtl818x_iowrite8(priv, &priv->map->MSR,
|
reg = RTL818X_MSR_INFRA;
|
||||||
RTL818X_MSR_NO_LINK);
|
} else
|
||||||
|
reg = RTL818X_MSR_NO_LINK;
|
||||||
|
rtl818x_iowrite8(priv, &priv->map->MSR, reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (changed & BSS_CHANGED_ERP_SLOT && priv->rf->conf_erp)
|
if (changed & BSS_CHANGED_ERP_SLOT && priv->rf->conf_erp)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче