aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/desc.h
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-08-30 22:25:40 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-30 15:19:16 -0700
commit0864db15a04711cae8ce3b63fbd459c8bf4df64c (patch)
tree8aedd4bef2cf138ea8946b53f3a88be6168dfeea /drivers/staging/vt6655/desc.h
parentstaging: vt6655: Replace typedef struct tagSRTSData with ieee80211_rts data (diff)
downloadlinux-dev-0864db15a04711cae8ce3b63fbd459c8bf4df64c.tar.xz
linux-dev-0864db15a04711cae8ce3b63fbd459c8bf4df64c.zip
staging: vt6655: Replace typedef struct tagSCTSData with ieee80211_cts data
ieee80211_cts data needs extra padding with reserved2 set to 0 use IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS to set frame_control Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/desc.h')
-rw-r--r--drivers/staging/vt6655/desc.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h
index 3ce5fe873bd9..00c3922e3ec2 100644
--- a/drivers/staging/vt6655/desc.h
+++ b/drivers/staging/vt6655/desc.h
@@ -403,19 +403,12 @@ typedef const SRTS_a_FB *PCSRTS_a_FB;
//
// CTS buffer header
//
-typedef struct tagSCTSData {
- unsigned short wFrameControl;
- unsigned short wDurationID;
- unsigned char abyRA[ETH_ALEN];
- unsigned short wReserved;
-} __attribute__ ((__packed__))
-SCTSData, *PSCTSData;
-
typedef struct tagSCTS {
struct vnt_phy_field b;
unsigned short wDuration_ba;
unsigned short wReserved;
- SCTSData Data;
+ struct ieee80211_cts data;
+ u16 reserved2;
} __attribute__ ((__packed__))
SCTS, *PSCTS;
typedef const SCTS *PCSCTS;
@@ -426,7 +419,8 @@ typedef struct tagSCTS_FB {
unsigned short wReserved;
unsigned short wCTSDuration_ba_f0;
unsigned short wCTSDuration_ba_f1;
- SCTSData Data;
+ struct ieee80211_cts data;
+ u16 reserved2;
} __attribute__ ((__packed__))
SCTS_FB, *PSCTS_FB;
typedef const SCTS_FB *PCSCTS_FB;