]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
staging: r8188eu: ensure proper alignment for eth address buffers
authorMichael Straube <straube.linux@gmail.com>
Mon, 23 Aug 2021 12:00:59 +0000 (14:00 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Aug 2021 10:23:11 +0000 (12:23 +0200)
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: Phillip Potter <phil@philpotter.co.uk>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210823120106.9633-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/include/rtw_recv.h
drivers/staging/r8188eu/include/rtw_xmit.h

index 81594e7aed51033b693a888a8361299ff5661841..1b41f8d7d079eea1c780d498db133820a86f1379 100644 (file)
@@ -109,11 +109,11 @@ struct rx_pkt_attrib {
 
        u16 eth_type;
 
-       u8      dst[ETH_ALEN];
-       u8      src[ETH_ALEN];
-       u8      ta[ETH_ALEN];
-       u8      ra[ETH_ALEN];
-       u8      bssid[ETH_ALEN];
+       u8      dst[ETH_ALEN] __aligned(2);
+       u8      src[ETH_ALEN] __aligned(2);
+       u8      ta[ETH_ALEN] __aligned(2);
+       u8      ra[ETH_ALEN] __aligned(2);
+       u8      bssid[ETH_ALEN] __aligned(2);
 
        u8 ack_policy;
 
index e1418a3f7ed139d9c06aa9ca6d83ad332a3d3a4f..5f6e2402e5c4d5860e6535c0e5462596442e2bec 100644 (file)
@@ -122,10 +122,10 @@ struct pkt_attrib {
        u8      ack_policy;
        u8      mac_id;
        u8      vcs_mode;       /* virtual carrier sense method */
-       u8      dst[ETH_ALEN];
-       u8      src[ETH_ALEN];
-       u8      ta[ETH_ALEN];
-       u8      ra[ETH_ALEN];
+       u8      dst[ETH_ALEN] __aligned(2);
+       u8      src[ETH_ALEN] __aligned(2);
+       u8      ta[ETH_ALEN] __aligned(2);
+       u8      ra[ETH_ALEN] __aligned(2);
        u8      key_idx;
        u8      qos_en;
        u8      ht_en;