summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtl818x
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-07-30 03:52:59 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-08-16 20:39:47 +0200
commit31a5cddaaed9c04ef653e3c2900cfb5a646fe686 (patch)
tree2d7f124dd2f7258af58e563b91756ac4e7b977b8 /drivers/net/wireless/rtl818x
parentrtl8180: use RTL818X_MSR_ADHOC for IBSS connection (diff)
downloadlinux-31a5cddaaed9c04ef653e3c2900cfb5a646fe686.tar.xz
linux-31a5cddaaed9c04ef653e3c2900cfb5a646fe686.zip
rtl8187: consolidate MSR writes in rtl8187_bss_info_changed
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtl818x')
-rw-r--r--drivers/net/wireless/rtl818x/rtl8187_dev.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 5738a55c1b06..0801c1d7c8d4 100644
--- 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);
}