Skip to content

L
linux
Commit 52c4130b authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6655: Replace typedef struct tagSRTSData with ieee80211_rts data 

Replacing SRTSData Data with struct ieee80211_rts data
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a479ffc3
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 51 deletions
drivers/staging/vt6655/desc.h
View file @ 52c4130b
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/mm.h> #include <linux/mm.h>
#include "linux/ieee80211.h"
#include "ttype.h" #include "ttype.h"
#include "tether.h" #include "tether.h"
...@@ -338,18 +339,6 @@ typedef struct tagSRrvTime_atim { ...@@ -338,18 +339,6 @@ typedef struct tagSRrvTime_atim {
SRrvTime_atim, *PSRrvTime_atim; SRrvTime_atim, *PSRrvTime_atim;
typedef const SRrvTime_atim *PCSRrvTime_atim; typedef const SRrvTime_atim *PCSRrvTime_atim;
//
// RTS buffer header
//
typedef struct tagSRTSData {
unsigned short wFrameControl;
unsigned short wDurationID;
unsigned char abyRA[ETH_ALEN];
unsigned char abyTA[ETH_ALEN];
} __attribute__ ((__packed__))
SRTSData, *PSRTSData;
typedef const SRTSData *PCSRTSData;
/* Length, Service, and Signal fields of Phy for Tx */ /* Length, Service, and Signal fields of Phy for Tx */
struct vnt_phy_field { struct vnt_phy_field {
u8 signal; u8 signal;
...@@ -370,7 +359,7 @@ typedef struct tagSRTS_g { ...@@ -370,7 +359,7 @@ typedef struct tagSRTS_g {
unsigned short wDuration_aa; unsigned short wDuration_aa;
unsigned short wDuration_bb; unsigned short wDuration_bb;
unsigned short wReserved; unsigned short wReserved;
SRTSData Data; struct ieee80211_rts data;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTS_g, *PSRTS_g; SRTS_g, *PSRTS_g;
typedef const SRTS_g *PCSRTS_g; typedef const SRTS_g *PCSRTS_g;
...@@ -386,7 +375,7 @@ typedef struct tagSRTS_g_FB { ...@@ -386,7 +375,7 @@ typedef struct tagSRTS_g_FB {
unsigned short wRTSDuration_aa_f0; unsigned short wRTSDuration_aa_f0;
unsigned short wRTSDuration_ba_f1; unsigned short wRTSDuration_ba_f1;
unsigned short wRTSDuration_aa_f1; unsigned short wRTSDuration_aa_f1;
SRTSData Data; struct ieee80211_rts data;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTS_g_FB, *PSRTS_g_FB; SRTS_g_FB, *PSRTS_g_FB;
typedef const SRTS_g_FB *PCSRTS_g_FB; typedef const SRTS_g_FB *PCSRTS_g_FB;
...@@ -395,7 +384,7 @@ typedef struct tagSRTS_ab { ...@@ -395,7 +384,7 @@ typedef struct tagSRTS_ab {
struct vnt_phy_field ab; struct vnt_phy_field ab;
unsigned short wDuration; unsigned short wDuration;
unsigned short wReserved; unsigned short wReserved;
SRTSData Data; struct ieee80211_rts data;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTS_ab, *PSRTS_ab; SRTS_ab, *PSRTS_ab;
typedef const SRTS_ab *PCSRTS_ab; typedef const SRTS_ab *PCSRTS_ab;
...@@ -406,7 +395,7 @@ typedef struct tagSRTS_a_FB { ...@@ -406,7 +395,7 @@ typedef struct tagSRTS_a_FB {
unsigned short wReserved; unsigned short wReserved;
unsigned short wRTSDuration_f0; unsigned short wRTSDuration_f0;
unsigned short wRTSDuration_f1; unsigned short wRTSDuration_f1;
SRTSData Data; struct ieee80211_rts data;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTS_a_FB, *PSRTS_a_FB; SRTS_a_FB, *PSRTS_a_FB;
typedef const SRTS_a_FB *PCSRTS_a_FB; typedef const SRTS_a_FB *PCSRTS_a_FB;
......
drivers/staging/vt6655/rxtx.c
View file @ 52c4130b
...@@ -832,19 +832,23 @@ s_vFillRTSHead( ...@@ -832,19 +832,23 @@ s_vFillRTSHead(
pBuf->wDuration_aa = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3: 2.4G OFDMData pBuf->wDuration_aa = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3: 2.4G OFDMData
pBuf->wDuration_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //1:RTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data pBuf->wDuration_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //1:RTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data
pBuf->Data.wDurationID = pBuf->wDuration_aa; pBuf->data.duration = pBuf->wDuration_aa;
//Get RTS Frame body /* Get RTS Frame body */
pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 pBuf->data.frame_control =
cpu_to_le16(IEEE80211_FTYPE_CTL |
IEEE80211_STYPE_RTS);
if ((pDevice->eOPMode == OP_MODE_ADHOC) || if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
(pDevice->eOPMode == OP_MODE_AP)) { (pDevice->eOPMode == OP_MODE_AP)) {
memcpy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), ETH_ALEN); memcpy(&pBuf->data.ra, psEthHeader->abyDstAddr, ETH_ALEN);
} else { } else {
memcpy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), ETH_ALEN); memcpy(&pBuf->data.ra, pDevice->abyBSSID, ETH_ALEN);
} }
if (pDevice->eOPMode == OP_MODE_AP) if (pDevice->eOPMode == OP_MODE_AP)
memcpy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), ETH_ALEN); memcpy(&pBuf->data.ta, pDevice->abyBSSID, ETH_ALEN);
else else
memcpy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), ETH_ALEN); memcpy(&pBuf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN);
} else { } else {
PSRTS_g_FB pBuf = (PSRTS_g_FB)pvRTS; PSRTS_g_FB pBuf = (PSRTS_g_FB)pvRTS;
...@@ -864,21 +868,24 @@ s_vFillRTSHead( ...@@ -864,21 +868,24 @@ s_vFillRTSHead(
pBuf->wRTSDuration_aa_f0 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:wRTSDuration_aa_f0, 1:2.4G, 1:CCKData pBuf->wRTSDuration_aa_f0 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:wRTSDuration_aa_f0, 1:2.4G, 1:CCKData
pBuf->wRTSDuration_ba_f1 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //6:wRTSDuration_ba_f1, 1:2.4G, 1:CCKData pBuf->wRTSDuration_ba_f1 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //6:wRTSDuration_ba_f1, 1:2.4G, 1:CCKData
pBuf->wRTSDuration_aa_f1 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //7:wRTSDuration_aa_f1, 1:2.4G, 1:CCKData pBuf->wRTSDuration_aa_f1 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //7:wRTSDuration_aa_f1, 1:2.4G, 1:CCKData
pBuf->Data.wDurationID = pBuf->wDuration_aa; pBuf->data.duration = pBuf->wDuration_aa;
//Get RTS Frame body /* Get RTS Frame body */
pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 pBuf->data.frame_control =
cpu_to_le16(IEEE80211_FTYPE_CTL |
IEEE80211_STYPE_RTS);
if ((pDevice->eOPMode == OP_MODE_ADHOC) || if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
(pDevice->eOPMode == OP_MODE_AP)) { (pDevice->eOPMode == OP_MODE_AP)) {
memcpy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), ETH_ALEN); memcpy(&pBuf->data.ra, psEthHeader->abyDstAddr, ETH_ALEN);
} else { } else {
memcpy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), ETH_ALEN); memcpy(&pBuf->data.ra, pDevice->abyBSSID, ETH_ALEN);
} }
if (pDevice->eOPMode == OP_MODE_AP) if (pDevice->eOPMode == OP_MODE_AP)
memcpy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), ETH_ALEN); memcpy(&pBuf->data.ta, pDevice->abyBSSID, ETH_ALEN);
else else
memcpy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), ETH_ALEN); memcpy(&pBuf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN);
} // if (byFBOption == AUTO_FB_NONE) } // if (byFBOption == AUTO_FB_NONE)
} else if (byPktType == PK_TYPE_11A) { } else if (byPktType == PK_TYPE_11A) {
...@@ -890,21 +897,24 @@ s_vFillRTSHead( ...@@ -890,21 +897,24 @@ s_vFillRTSHead(
byPktType, &pBuf->ab); byPktType, &pBuf->ab);
//Get Duration //Get Duration
pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData
pBuf->Data.wDurationID = pBuf->wDuration; pBuf->data.duration = pBuf->wDuration;
//Get RTS Frame body /* Get RTS Frame body */
pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 pBuf->data.frame_control =
cpu_to_le16(IEEE80211_FTYPE_CTL |
IEEE80211_STYPE_RTS);
if ((pDevice->eOPMode == OP_MODE_ADHOC) || if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
(pDevice->eOPMode == OP_MODE_AP)) { (pDevice->eOPMode == OP_MODE_AP)) {
memcpy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), ETH_ALEN); memcpy(&pBuf->data.ra, psEthHeader->abyDstAddr, ETH_ALEN);
} else { } else {
memcpy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), ETH_ALEN); memcpy(&pBuf->data.ra, pDevice->abyBSSID, ETH_ALEN);
} }
if (pDevice->eOPMode == OP_MODE_AP) if (pDevice->eOPMode == OP_MODE_AP)
memcpy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), ETH_ALEN); memcpy(&pBuf->data.ta, pDevice->abyBSSID, ETH_ALEN);
else else
memcpy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), ETH_ALEN); memcpy(&pBuf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN);
} else { } else {
PSRTS_a_FB pBuf = (PSRTS_a_FB)pvRTS; PSRTS_a_FB pBuf = (PSRTS_a_FB)pvRTS;
...@@ -916,20 +926,23 @@ s_vFillRTSHead( ...@@ -916,20 +926,23 @@ s_vFillRTSHead(
pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData
pBuf->wRTSDuration_f0 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:RTSDuration_aa_f0, 0:5G, 0: 5G OFDMData pBuf->wRTSDuration_f0 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:RTSDuration_aa_f0, 0:5G, 0: 5G OFDMData
pBuf->wRTSDuration_f1 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //7:RTSDuration_aa_f1, 0:5G, 0: pBuf->wRTSDuration_f1 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //7:RTSDuration_aa_f1, 0:5G, 0:
pBuf->Data.wDurationID = pBuf->wDuration; pBuf->data.duration = pBuf->wDuration;
//Get RTS Frame body /* Get RTS Frame body */
pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 pBuf->data.frame_control =
cpu_to_le16(IEEE80211_FTYPE_CTL |
IEEE80211_STYPE_RTS);
if ((pDevice->eOPMode == OP_MODE_ADHOC) || if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
(pDevice->eOPMode == OP_MODE_AP)) { (pDevice->eOPMode == OP_MODE_AP)) {
memcpy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), ETH_ALEN); memcpy(&pBuf->data.ra, psEthHeader->abyDstAddr, ETH_ALEN);
} else { } else {
memcpy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), ETH_ALEN); memcpy(&pBuf->data.ra, pDevice->abyBSSID, ETH_ALEN);
} }
if (pDevice->eOPMode == OP_MODE_AP) if (pDevice->eOPMode == OP_MODE_AP)
memcpy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), ETH_ALEN); memcpy(&pBuf->data.ta, pDevice->abyBSSID, ETH_ALEN);
else else
memcpy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), ETH_ALEN); memcpy(&pBuf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN);
} }
} else if (byPktType == PK_TYPE_11B) { } else if (byPktType == PK_TYPE_11B) {
PSRTS_ab pBuf = (PSRTS_ab)pvRTS; PSRTS_ab pBuf = (PSRTS_ab)pvRTS;
...@@ -939,21 +952,22 @@ s_vFillRTSHead( ...@@ -939,21 +952,22 @@ s_vFillRTSHead(
PK_TYPE_11B, &pBuf->ab); PK_TYPE_11B, &pBuf->ab);
//Get Duration //Get Duration
pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData
pBuf->Data.wDurationID = pBuf->wDuration; pBuf->data.duration = pBuf->wDuration;
//Get RTS Frame body /* Get RTS Frame body */
pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 pBuf->data.frame_control =
cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS);
if ((pDevice->eOPMode == OP_MODE_ADHOC) || if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
(pDevice->eOPMode == OP_MODE_AP)) { (pDevice->eOPMode == OP_MODE_AP)) {
memcpy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), ETH_ALEN); memcpy(&pBuf->data.ra, psEthHeader->abyDstAddr, ETH_ALEN);
} else { } else {
memcpy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), ETH_ALEN); memcpy(&pBuf->data.ra, pDevice->abyBSSID, ETH_ALEN);
} }
if (pDevice->eOPMode == OP_MODE_AP) if (pDevice->eOPMode == OP_MODE_AP)
memcpy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), ETH_ALEN); memcpy(&pBuf->data.ta, pDevice->abyBSSID, ETH_ALEN);
else else
memcpy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), ETH_ALEN); memcpy(&pBuf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7