diff options
Diffstat (limited to 'drivers/staging/wlan-ng/hfa384x.h')
| -rw-r--r-- | drivers/staging/wlan-ng/hfa384x.h | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index 88e894dd3568..75ed8bc4bbc1 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h @@ -475,14 +475,7 @@ struct hfa384x_tx_frame { u16 tx_control; /*-- 802.11 Header Information --*/ - - u16 frame_control; - u16 duration_id; - u8 address1[6]; - u8 address2[6]; - u8 address3[6]; - u16 sequence_control; - u8 address4[6]; + struct p80211_hdr hdr; __le16 data_len; /* little endian format */ /*-- 802.3 Header Information --*/ @@ -541,13 +534,7 @@ struct hfa384x_rx_frame { u16 reserved2; /*-- 802.11 Header Information (802.11 byte order) --*/ - __le16 frame_control; - u16 duration_id; - u8 address1[6]; - u8 address2[6]; - u8 address3[6]; - u16 sequence_control; - u8 address4[6]; + struct p80211_hdr hdr; __le16 data_len; /* hfa384x (little endian) format */ /*-- 802.3 Header Information --*/ @@ -1423,7 +1410,7 @@ int hfa384x_drvr_start(struct hfa384x *hw); int hfa384x_drvr_stop(struct hfa384x *hw); int hfa384x_drvr_txframe(struct hfa384x *hw, struct sk_buff *skb, - union p80211_hdr *p80211_hdr, + struct p80211_hdr *p80211_hdr, struct p80211_metawep *p80211_wep); void hfa384x_tx_timeout(struct wlandevice *wlandev); |