Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

wifi: b43: fix incorrect __packed annotation

clang warns about an unpacked structure inside of a packed one:

drivers/net/wireless/broadcom/b43/b43.h:654:4: error: field data within 'struct b43_iv' is less aligned than 'union (unnamed union at /home/arnd/arm-soc/drivers/net/wireless/broadcom/b43/b43.h:651:2)' and is usually due to 'struct b43_iv' being packed, which can lead to unaligned accesses [-Werror,-Wunaligned-access]

The problem here is that the anonymous union has the default alignment
from its members, apparently because the original author mixed up the
placement of the __packed attribute by placing it next to the struct
member rather than the union definition. As the struct itself is
also marked as __packed, there is no need to mark its members, so just
move the annotation to the inner type instead.

As Michael noted, the same problem is present in b43legacy, so
change both at the same time.

Acked-by: Michael Büsch <m@bues.ch>
Reported-by: kernel test robot <lkp@intel.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Link: https://lore.kernel.org/oe-kbuild-all/202305160749.ay1HAoyP-lkp@intel.com/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230516183442.536589-1-arnd@kernel.org

authored by

Arnd Bergmann and committed by
Kalle Valo
212457cc cb0ddaaa

+2 -2
+1 -1
drivers/net/wireless/broadcom/b43/b43.h
··· 651 651 union { 652 652 __be16 d16; 653 653 __be32 d32; 654 - } data __packed; 654 + } __packed data; 655 655 } __packed; 656 656 657 657
+1 -1
drivers/net/wireless/broadcom/b43legacy/b43legacy.h
··· 379 379 union { 380 380 __be16 d16; 381 381 __be32 d32; 382 - } data __packed; 382 + } __packed data; 383 383 } __packed; 384 384 385 385 #define B43legacy_PHYMODE(phytype) (1 << (phytype))