openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtl8180: use RTL818X_MSR_ADHOC for IBSS connection 

Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville 2010-07-29 21:50:29 -04:00
parent 030725d2c7
commit 0f956e7107
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/wireless/rtl818x/rtl8180_dev.c
View File

@ -790,6 +790,7 @@ static void rtl8180_bss_info_changed(struct ieee80211_hw *dev,
struct rtl8180_priv *priv = dev->priv;
struct rtl8180_vif *vif_priv;
int i;
u8 reg;
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],
info->bssid[i]);
if (is_valid_ether_addr(info->bssid))
rtl818x_iowrite8(priv, &priv->map->MSR,
RTL818X_MSR_INFRA);
else
rtl818x_iowrite8(priv, &priv->map->MSR,
RTL818X_MSR_NO_LINK);
if (is_valid_ether_addr(info->bssid)) {
if (vif->type == NL80211_IFTYPE_ADHOC)
reg = RTL818X_MSR_ADHOC;
else
reg = RTL818X_MSR_INFRA;
} else
reg = RTL818X_MSR_NO_LINK;
rtl818x_iowrite8(priv, &priv->map->MSR, reg);
}
if (changed & BSS_CHANGED_ERP_SLOT && priv->rf->conf_erp)