Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / net / wireless / rtl818x / rtl8187_dev.c

diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 5738a55..0801c1d 100644 (file)
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -1176,13 +1176,12 @@ static void rtl8187_bss_info_changed(struct ieee80211_hw *dev,
                else
                        reg = 0;
 
-               if (is_valid_ether_addr(info->bssid)) {
+               if (is_valid_ether_addr(info->bssid))
                        reg |= RTL818X_MSR_INFRA;
-                       rtl818x_iowrite8(priv, &priv->map->MSR, reg);
-               } else {
+               else
                        reg |= RTL818X_MSR_NO_LINK;
-                       rtl818x_iowrite8(priv, &priv->map->MSR, reg);
-               }
+
+               rtl818x_iowrite8(priv, &priv->map->MSR, reg);
 
                mutex_unlock(&priv->conf_mutex);
        }