[PATCH net-next] ath10k: wmi: Convert use of 6 to ETH_ALEN

Kalle Valo kvalo at qca.qualcomm.com
Thu Oct 3 00:34:11 EDT 2013


Eric Dumazet <eric.dumazet at gmail.com> writes:

> On Wed, 2013-10-02 at 20:39 -0700, Joe Perches wrote:
>> Use the appropriate define instead of 6.
>> 
>> Signed-off-by: Joe Perches <joe at perches.com>
>> Noticed-by: Julia Lawall <julia.lawall at lip6.fr> via spatch script
>> 
>> ---
>> 
>>  drivers/net/wireless/ath/ath10k/wmi.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
>> index bee88e8..48d44e7 100644
>> --- a/drivers/net/wireless/ath/ath10k/wmi.c
>> +++ b/drivers/net/wireless/ath/ath10k/wmi.c
>> @@ -1758,7 +1758,7 @@ int ath10k_wmi_vdev_up(struct ath10k *ar, u32 vdev_id, u32 aid, const u8 *bssid)
>>  	cmd = (struct wmi_vdev_up_cmd *)skb->data;
>>  	cmd->vdev_id       = __cpu_to_le32(vdev_id);
>>  	cmd->vdev_assoc_id = __cpu_to_le32(aid);
>> -	memcpy(&cmd->vdev_bssid.addr, bssid, 6);
>> +	memcpy(&cmd->vdev_bssid.addr, bssid, ETH_ALEN);
>>  
>>  	ath10k_dbg(ATH10K_DBG_WMI,
>>  		   "wmi mgmt vdev up id 0x%x assoc id %d bssid %pM\n",
>
> I don't get it.
>
> Why leaving this then ?
>
> struct wmi_mac_addr {
>         union {
>                 u8 addr[6];
>                 struct {
>                         u32 word0;
>                         u32 word1;
>                 } __packed;
>         } __packed;
> } __packed;

Do you mean '6' or the union? The 6 can replaced with ETH_ALEN AFAICS.
But the union is needed for aligning the packets as firmware expects
them.

-- 
Kalle Valo



More information about the ath10k mailing list