Commit 8aa824f2 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: ensure proper alignment for eth address buffers 



Add __aligned(2) to eth address buffers in structs rx_pkt_attrib and
pkt_attrib to ensure proper alignment for usage with functions from
<linux/etherdevice.h>

Acked-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210823120106.9633-2-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2a3afb16

drivers/staging/r8188eu/include/rtw_recv.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -109,11 +109,11 @@ struct rx_pkt_attrib { 




	u16 eth_type;

	u16 eth_type;





	u8	dst[ETH_ALEN];

	u8	dst[ETH_ALEN] __aligned(2);

	u8	src[ETH_ALEN];

	u8	src[ETH_ALEN] __aligned(2);

	u8	ta[ETH_ALEN];

	u8	ta[ETH_ALEN] __aligned(2);

	u8	ra[ETH_ALEN];

	u8	ra[ETH_ALEN] __aligned(2);

	u8	bssid[ETH_ALEN];

	u8	bssid[ETH_ALEN] __aligned(2);





	u8 ack_policy;

	u8 ack_policy;

drivers/staging/r8188eu/include/rtw_xmit.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -122,10 +122,10 @@ struct pkt_attrib { 
	u8	ack_policy;

	u8	ack_policy;

	u8	mac_id;

	u8	mac_id;

	u8	vcs_mode;	/* virtual carrier sense method */

	u8	vcs_mode;	/* virtual carrier sense method */

	u8	dst[ETH_ALEN];

	u8	dst[ETH_ALEN] __aligned(2);

	u8	src[ETH_ALEN];

	u8	src[ETH_ALEN] __aligned(2);

	u8	ta[ETH_ALEN];

	u8	ta[ETH_ALEN] __aligned(2);

	u8	ra[ETH_ALEN];

	u8	ra[ETH_ALEN] __aligned(2);

	u8	key_idx;

	u8	key_idx;

	u8	qos_en;

	u8	qos_en;

	u8	ht_en;

	u8	ht_en;