[rt2x00-users] [PATCH 4/8] rt2x00: Don't set unicast/BSSID masks when clearning MAC or BSSID

[Gertjan van Wingerde]

On 08/30/10 19:23, Ivo van Doorn wrote:
> When configuring the MAC_ADDR or MAC_BSSID with an empty address,
> the UNICAST_TO_ME_MASK and BSS_ID_MASK must also be reset to prevent
> invalid interpretation of the addresses.
> 
> Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>

Acked-by: Gertjan van Wingerde <gwingerde at gmail.com>

> ---
>  drivers/net/wireless/rt2x00/rt2800lib.c |   18 +++++++++++-------
>  1 files changed, 11 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index 1bc7f49..27a6e22 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -1135,19 +1135,23 @@ void rt2800_config_intf(struct rt2x00_dev *rt2x00dev, struct rt2x00_intf *intf,
>  	}
>  
>  	if (flags & CONFIG_UPDATE_MAC) {
> -		reg = le32_to_cpu(conf->mac[1]);
> -		rt2x00_set_field32(&reg, MAC_ADDR_DW1_UNICAST_TO_ME_MASK, 0xff);
> -		conf->mac[1] = cpu_to_le32(reg);
> +		if (!is_zero_ether_addr((const u8 *)conf->mac)) {
> +			reg = le32_to_cpu(conf->mac[1]);
> +			rt2x00_set_field32(&reg, MAC_ADDR_DW1_UNICAST_TO_ME_MASK, 0xff);
> +			conf->mac[1] = cpu_to_le32(reg);
> +		}
>  
>  		rt2800_register_multiwrite(rt2x00dev, MAC_ADDR_DW0,
>  					      conf->mac, sizeof(conf->mac));
>  	}
>  
>  	if (flags & CONFIG_UPDATE_BSSID) {
> -		reg = le32_to_cpu(conf->bssid[1]);
> -		rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_ID_MASK, 3);
> -		rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_BCN_NUM, 7);
> -		conf->bssid[1] = cpu_to_le32(reg);
> +		if (!is_zero_ether_addr((const u8 *)conf->bssid)) {
> +			reg = le32_to_cpu(conf->bssid[1]);
> +			rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_ID_MASK, 3);
> +			rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_BCN_NUM, 7);
> +			conf->bssid[1] = cpu_to_le32(reg);
> +		}
>  
>  		rt2800_register_multiwrite(rt2x00dev, MAC_BSSID_DW0,
>  					      conf->bssid, sizeof(conf->bssid));