]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
rtl8187: consolidate MSR writes in rtl8187_bss_info_changed
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 30 Jul 2010 01:52:59 +0000 (21:52 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 16 Aug 2010 18:39:47 +0000 (14:39 -0400)
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rtl818x/rtl8187_dev.c

index 5738a55c1b06b4c9bd7a8c30323266b0af2151b4..0801c1d7c8d42cd8094fd3179d25fd76c0ba0c0b 100644 (file)
@@ -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);
        }