staging: vt6655: mac80211 conversion: s_vFillRTSHead convert to using struct ieee80211_hdr
Removing PSEthernetHeader Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
9c71cb3209
commit
7c0496d191
|
@ -127,7 +127,7 @@ s_vFillRTSHead(
|
|||
unsigned int cbFrameLength,
|
||||
bool bNeedAck,
|
||||
bool bDisCRC,
|
||||
PSEthernetHeader psEthHeader,
|
||||
struct ieee80211_hdr *hdr,
|
||||
unsigned short wCurrentRate,
|
||||
unsigned char byFBOption
|
||||
);
|
||||
|
@ -789,7 +789,7 @@ s_vFillRTSHead(
|
|||
unsigned int cbFrameLength,
|
||||
bool bNeedAck,
|
||||
bool bDisCRC,
|
||||
PSEthernetHeader psEthHeader,
|
||||
struct ieee80211_hdr *hdr,
|
||||
unsigned short wCurrentRate,
|
||||
unsigned char byFBOption
|
||||
)
|
||||
|
@ -841,22 +841,8 @@ s_vFillRTSHead(
|
|||
cpu_to_le16(IEEE80211_FTYPE_CTL |
|
||||
IEEE80211_STYPE_RTS);
|
||||
|
||||
|
||||
if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) ||
|
||||
(pDevice->op_mode == NL80211_IFTYPE_AP)) {
|
||||
ether_addr_copy(buf->data.ra,
|
||||
psEthHeader->abyDstAddr);
|
||||
} else {
|
||||
ether_addr_copy(buf->data.ra,
|
||||
pDevice->abyBSSID);
|
||||
}
|
||||
if (pDevice->op_mode == NL80211_IFTYPE_AP)
|
||||
ether_addr_copy(buf->data.ta,
|
||||
pDevice->abyBSSID);
|
||||
else
|
||||
ether_addr_copy(buf->data.ta,
|
||||
psEthHeader->abySrcAddr);
|
||||
|
||||
ether_addr_copy(buf->data.ra, hdr->addr1);
|
||||
ether_addr_copy(buf->data.ta, hdr->addr2);
|
||||
} else {
|
||||
struct vnt_rts_g_fb *buf = pvRTS;
|
||||
/* Get SignalField, ServiceField & Length */
|
||||
|
@ -909,23 +895,8 @@ s_vFillRTSHead(
|
|||
cpu_to_le16(IEEE80211_FTYPE_CTL |
|
||||
IEEE80211_STYPE_RTS);
|
||||
|
||||
|
||||
if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) ||
|
||||
(pDevice->op_mode == NL80211_IFTYPE_AP)) {
|
||||
ether_addr_copy(buf->data.ra,
|
||||
psEthHeader->abyDstAddr);
|
||||
} else {
|
||||
ether_addr_copy(buf->data.ra,
|
||||
pDevice->abyBSSID);
|
||||
}
|
||||
|
||||
if (pDevice->op_mode == NL80211_IFTYPE_AP)
|
||||
ether_addr_copy(buf->data.ta,
|
||||
pDevice->abyBSSID);
|
||||
else
|
||||
ether_addr_copy(buf->data.ta,
|
||||
psEthHeader->abySrcAddr);
|
||||
|
||||
ether_addr_copy(buf->data.ra, hdr->addr1);
|
||||
ether_addr_copy(buf->data.ta, hdr->addr2);
|
||||
} // if (byFBOption == AUTO_FB_NONE)
|
||||
} else if (byPktType == PK_TYPE_11A) {
|
||||
if (byFBOption == AUTO_FB_NONE) {
|
||||
|
@ -946,23 +917,8 @@ s_vFillRTSHead(
|
|||
cpu_to_le16(IEEE80211_FTYPE_CTL |
|
||||
IEEE80211_STYPE_RTS);
|
||||
|
||||
|
||||
if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) ||
|
||||
(pDevice->op_mode == NL80211_IFTYPE_AP)) {
|
||||
ether_addr_copy(buf->data.ra,
|
||||
psEthHeader->abyDstAddr);
|
||||
} else {
|
||||
ether_addr_copy(buf->data.ra,
|
||||
pDevice->abyBSSID);
|
||||
}
|
||||
|
||||
if (pDevice->op_mode == NL80211_IFTYPE_AP)
|
||||
ether_addr_copy(buf->data.ta,
|
||||
pDevice->abyBSSID);
|
||||
else
|
||||
ether_addr_copy(buf->data.ta,
|
||||
psEthHeader->abySrcAddr);
|
||||
|
||||
ether_addr_copy(buf->data.ra, hdr->addr1);
|
||||
ether_addr_copy(buf->data.ta, hdr->addr2);
|
||||
} else {
|
||||
struct vnt_rts_a_fb *buf = pvRTS;
|
||||
/* Get SignalField, ServiceField & Length */
|
||||
|
@ -991,20 +947,8 @@ s_vFillRTSHead(
|
|||
cpu_to_le16(IEEE80211_FTYPE_CTL |
|
||||
IEEE80211_STYPE_RTS);
|
||||
|
||||
if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) ||
|
||||
(pDevice->op_mode == NL80211_IFTYPE_AP)) {
|
||||
ether_addr_copy(buf->data.ra,
|
||||
psEthHeader->abyDstAddr);
|
||||
} else {
|
||||
ether_addr_copy(buf->data.ra,
|
||||
pDevice->abyBSSID);
|
||||
}
|
||||
if (pDevice->op_mode == NL80211_IFTYPE_AP)
|
||||
ether_addr_copy(buf->data.ta,
|
||||
pDevice->abyBSSID);
|
||||
else
|
||||
ether_addr_copy(buf->data.ta,
|
||||
psEthHeader->abySrcAddr);
|
||||
ether_addr_copy(buf->data.ra, hdr->addr1);
|
||||
ether_addr_copy(buf->data.ta, hdr->addr2);
|
||||
}
|
||||
} else if (byPktType == PK_TYPE_11B) {
|
||||
struct vnt_rts_ab *buf = pvRTS;
|
||||
|
@ -1023,19 +967,8 @@ s_vFillRTSHead(
|
|||
buf->data.frame_control =
|
||||
cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS);
|
||||
|
||||
if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) ||
|
||||
(pDevice->op_mode == NL80211_IFTYPE_AP)) {
|
||||
ether_addr_copy(buf->data.ra,
|
||||
psEthHeader->abyDstAddr);
|
||||
} else {
|
||||
ether_addr_copy(buf->data.ra, pDevice->abyBSSID);
|
||||
}
|
||||
|
||||
if (pDevice->op_mode == NL80211_IFTYPE_AP)
|
||||
ether_addr_copy(buf->data.ta, pDevice->abyBSSID);
|
||||
else
|
||||
ether_addr_copy(buf->data.ta,
|
||||
psEthHeader->abySrcAddr);
|
||||
ether_addr_copy(buf->data.ra, hdr->addr1);
|
||||
ether_addr_copy(buf->data.ta, hdr->addr2);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue