2010-07-30 02:00:41

by John W. Linville

Subject: [PATCH] rtl8187: consolidate MSR writes in rtl8187_bss_info_changed

Signed-off-by: John W. Linville <[email protected]>
---
drivers/net/wireless/rtl818x/rtl8187_dev.c | 9 ++++-----
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 5738a55..0801c1d 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);
}
--
1.7.1.1

2010-07-30 03:14:24

by Larry Finger

Subject: Re: [PATCH] rtl8187: consolidate MSR writes in rtl8187_bss_info_changed

On 07/29/2010 08:57 PM, John W. Linville wrote:
> Signed-off-by: John W. Linville <[email protected]>
> ---
ACK.

Larry

2010-07-30 03:22:09

by Hin-Tak Leung

Subject: Re: [PATCH] rtl8187: consolidate MSR writes in rtl8187_bss_info_changed

John W. Linville wrote:
> Signed-off-by: John W. Linville <[email protected]>

Acked-by: Hin-Tak Leung <[email protected]>

Thanks for looking this over. I wondered how the code came to be like this, so I
went to look it up - the reason was that we used to have more lines between the
{}'s and they were gradually removed. The full list of defines for the
RTL818X_MSR_* are :

#define RTL818X_MSR_NO_LINK (0 << 2)
#define RTL818X_MSR_ADHOC (1 << 2)
#define RTL818X_MSR_INFRA (2 << 2)
#define RTL818X_MSR_MASTER (3 << 2)
#define RTL818X_MSR_ENEDCA (4 << 2)

but we only use 3 at the moment (not _AHOC nor _MASTER).

Hin-Tak

> ---
> drivers/net/wireless/rtl818x/rtl8187_dev.c | 9 ++++-----
> 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 5738a55..0801c1d 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);
> }