diff options
Diffstat (limited to 'drivers/staging/wlan-ng/p80211hdr.h')
| -rw-r--r-- | drivers/staging/wlan-ng/p80211hdr.h | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/drivers/staging/wlan-ng/p80211hdr.h b/drivers/staging/wlan-ng/p80211hdr.h index 6564810fd026..5871a55e4a61 100644 --- a/drivers/staging/wlan-ng/p80211hdr.h +++ b/drivers/staging/wlan-ng/p80211hdr.h @@ -148,28 +148,14 @@ /* Generic 802.11 Header types */ -struct p80211_hdr_a3 { - __le16 fc; - u16 dur; - u8 a1[ETH_ALEN]; - u8 a2[ETH_ALEN]; - u8 a3[ETH_ALEN]; - u16 seq; -} __packed; - -struct p80211_hdr_a4 { - u16 fc; - u16 dur; - u8 a1[ETH_ALEN]; - u8 a2[ETH_ALEN]; - u8 a3[ETH_ALEN]; - u16 seq; - u8 a4[ETH_ALEN]; -} __packed; - -union p80211_hdr { - struct p80211_hdr_a3 a3; - struct p80211_hdr_a4 a4; +struct p80211_hdr { + __le16 frame_control; + u16 duration_id; + u8 address1[ETH_ALEN]; + u8 address2[ETH_ALEN]; + u8 address3[ETH_ALEN]; + u16 sequence_control; + u8 address4[ETH_ALEN]; } __packed; /* Frame and header length macros */ |