1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 02d0f71d0faa..9544eb1a23dc 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@ -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)