diff options
| author | Kees Cook <keescook@chromium.org> | 2021-08-19 20:45:36 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-26 11:41:16 +0300 |
| commit | 6277fbfdd29ca2fbf5da33e3931087b5356c770b (patch) | |
| tree | ae2aab3e4f16773bcff260a8b1c9aa09f67d4ee6 /drivers/staging/wlan-ng/p80211mgmt.h | |
| parent | 55cdf7d7b2a187d0c2bcf11ed70e2eeb192713da (diff) | |
| download | linux-6277fbfdd29ca2fbf5da33e3931087b5356c770b.tar.xz | |
staging: wlan-ng: Remove pointless a3/a4 union
There is no need for the a3/a4 union. The two structs are identical
except for the addition of a4. Excepting one place, the structs are
only ever used in the union, and the union is always allocated at full
size. The one instance of the a3-specific struct can be replaced with
the full version, as no sizing information is used. Replace the union
with the a4 version of the struct. "diffoscope" reports there are no
object code differences after this change.
Cc: Allen Pais <apais@linux.microsoft.com>
Cc: Romain Perier <romain.perier@gmail.com>
Cc: Chen Lin <chen.lin5@zte.com.cn>
Cc: Ivan Safonov <insafonov@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-staging@lists.linux.dev
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210819174537.3499227-2-keescook@chromium.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wlan-ng/p80211mgmt.h')
| -rw-r--r-- | drivers/staging/wlan-ng/p80211mgmt.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h index c045c08e1991..1457a6def5a2 100644 --- a/drivers/staging/wlan-ng/p80211mgmt.h +++ b/drivers/staging/wlan-ng/p80211mgmt.h @@ -299,7 +299,7 @@ struct wlan_fr_mgmt { u16 type; u16 len; /* DOES NOT include CRC !!!! */ u8 *buf; - union p80211_hdr *hdr; + struct p80211_hdr *hdr; /* used for target specific data, skb in Linux */ void *priv; /*-- fixed fields -----------*/ @@ -311,7 +311,7 @@ struct wlan_fr_beacon { u16 type; u16 len; u8 *buf; - union p80211_hdr *hdr; + struct p80211_hdr *hdr; /* used for target specific data, skb in Linux */ void *priv; /*-- fixed fields -----------*/ @@ -334,7 +334,7 @@ struct wlan_fr_ibssatim { u16 type; u16 len; u8 *buf; - union p80211_hdr *hdr; + struct p80211_hdr *hdr; /* used for target specific data, skb in Linux */ void *priv; @@ -350,7 +350,7 @@ struct wlan_fr_disassoc { u16 type; u16 len; u8 *buf; - union p80211_hdr *hdr; + struct p80211_hdr *hdr; /* used for target specific data, skb in Linux */ void *priv; /*-- fixed fields -----------*/ @@ -365,7 +365,7 @@ struct wlan_fr_assocreq { u16 type; u16 len; u8 *buf; - union p80211_hdr *hdr; + struct p80211_hdr *hdr; /* used for target specific data, skb in Linux */ void *priv; /*-- fixed fields -----------*/ @@ -382,7 +382,7 @@ struct wlan_fr_assocresp { u16 type; u16 len; u8 *buf; - union p80211_hdr *hdr; + struct p80211_hdr *hdr; /* used for target specific data, skb in Linux */ void *priv; /*-- fixed fields -----------*/ @@ -399,7 +399,7 @@ struct wlan_fr_reassocreq { u16 type; u16 len; u8 *buf; - union p80211_hdr *hdr; + struct p80211_hdr *hdr; /* used for target specific data, skb in Linux */ void *priv; /*-- fixed fields -----------*/ @@ -417,7 +417,7 @@ struct wlan_fr_reassocresp { u16 type; u16 len; u8 *buf; - union p80211_hdr *hdr; + struct p80211_hdr *hdr; /* used for target specific data, skb in Linux */ void *priv; /*-- fixed fields -----------*/ @@ -434,7 +434,7 @@ struct wlan_fr_probereq { u16 type; u16 len; u8 *buf; - union p80211_hdr *hdr; + struct p80211_hdr *hdr; /* used for target specific data, skb in Linux */ void *priv; /*-- fixed fields -----------*/ @@ -449,7 +449,7 @@ struct wlan_fr_proberesp { u16 type; u16 len; u8 *buf; - union p80211_hdr *hdr; + struct p80211_hdr *hdr; /* used for target specific data, skb in Linux */ void *priv; /*-- fixed fields -----------*/ @@ -470,7 +470,7 @@ struct wlan_fr_authen { u16 type; u16 len; u8 *buf; - union p80211_hdr *hdr; + struct p80211_hdr *hdr; /* used for target specific data, skb in Linux */ void *priv; /*-- fixed fields -----------*/ @@ -487,7 +487,7 @@ struct wlan_fr_deauthen { u16 type; u16 len; u8 *buf; - union p80211_hdr *hdr; + struct p80211_hdr *hdr; /* used for target specific data, skb in Linux */ void *priv; /*-- fixed fields -----------*/ |