From b39f8acf83fb9483287cb6e79acb5afbd99f0db9 Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov Date: Thu, 5 Sep 2019 18:51:49 +0200 Subject: [PATCH 33/43] Revert "iwlwifi: RX API: remove unnecessary anonymous struct" This reverts commit 838f4c73a353be28222593babeeac9edca1b1be0. --- drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 28 ++++++++++++++------------ 1 file changed, 15 insertions(+), 13 deletions(-) Index: src/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h =================================================================== --- src.orig/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h 2019-09-06 01:25:45.197295875 +0200 +++ src/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h 2019-09-06 01:25:46.052284970 +0200 @@ -594,21 +594,23 @@ */ u8 mac_phy_idx; /* DW4 - carries csum data only when rpa_en == 1 */ - /** - * @raw_csum: raw checksum (alledgedly unreliable) - */ - __le16 raw_csum; - - union { + struct { /** - * @l3l4_flags: &enum iwl_rx_l3l4_flags + * @raw_csum: raw checksum (alledgedly unreliable) */ - __le16 l3l4_flags; + __le16 raw_csum; - /** - * @sigb_common2: for HE sniffer, HE-SIG-B common part 2 - */ - __le16 sigb_common2; + union { + /** + * @l3l4_flags: &enum iwl_rx_l3l4_flags + */ + __le16 l3l4_flags; + + /** + * @sigb_common2: for HE sniffer, HE-SIG-B common part 2 + */ + __le16 sigb_common2; + }; }; /* DW5 */ /**