| Message ID | 1412790295-27858-1-git-send-email-Larry.Finger@lwfinger.net (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
From: Larry Finger <Larry.Finger@lwfinger.net> Date: Wed, 8 Oct 2014 12:44:55 -0500 > Two macros used to copy BSSID information use ether_addr_copy(), thus > the arrays must be 2-byte aligned. In one case, the array could become > unaligned if the struct containing it were changed. Use the __unaligned(2) > attribute to retain the necessary alignment. In addition, the magic number > used to specify the size of the array is replaced by ETH_ALEN. > > Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Acked-by: David S. Miller <davem@davemloft.net> -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index 976667a..6866dcf 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h @@ -1370,7 +1370,7 @@ struct rtl_mac { bool rdg_en; /*AP*/ - u8 bssid[6]; + u8 bssid[ETH_ALEN] __aligned(2); u32 vendor; u8 mcs[16]; /* 16 bytes mcs for HT rates. */ u32 basic_rates; /* b/g rates */
Two macros used to copy BSSID information use ether_addr_copy(), thus the arrays must be 2-byte aligned. In one case, the array could become unaligned if the struct containing it were changed. Use the __unaligned(2) attribute to retain the necessary alignment. In addition, the magic number used to specify the size of the array is replaced by ETH_ALEN. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> --- drivers/net/wireless/rtlwifi/wifi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)