Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 14
Star 1
Fork 0
R
raspberrypi-kernel
提交 7c0496d1 编写于 作者: M Malcolm Priestley 提交者： Greg Kroah-Hartman
浏览文件
操作

staging: vt6655: mac80211 conversion: s_vFillRTSHead convert to using struct ieee80211_hdr 

Removing PSEthernetHeader
Signed-off-by: NMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 9c71cb32
隐藏空白更改
内联 并排
Showing with 12 addition and 79 deletion
drivers/staging/vt6655/rxtx.c
浏览文件 @ 7c0496d1
...@@ -127,7 +127,7 @@ s_vFillRTSHead( ...@@ -127,7 +127,7 @@ s_vFillRTSHead(
unsigned int cbFrameLength, unsigned int cbFrameLength,
bool bNeedAck, bool bNeedAck,
bool bDisCRC, bool bDisCRC,
PSEthernetHeader psEthHeader, struct ieee80211_hdr *hdr,
unsigned short wCurrentRate, unsigned short wCurrentRate,
unsigned char byFBOption unsigned char byFBOption
); );
...@@ -789,7 +789,7 @@ s_vFillRTSHead( ...@@ -789,7 +789,7 @@ s_vFillRTSHead(
unsigned int cbFrameLength, unsigned int cbFrameLength,
bool bNeedAck, bool bNeedAck,
bool bDisCRC, bool bDisCRC,
PSEthernetHeader psEthHeader, struct ieee80211_hdr *hdr,
unsigned short wCurrentRate, unsigned short wCurrentRate,
unsigned char byFBOption unsigned char byFBOption
) )
...@@ -841,22 +841,8 @@ s_vFillRTSHead( ...@@ -841,22 +841,8 @@ s_vFillRTSHead(
cpu_to_le16(IEEE80211_FTYPE_CTL | cpu_to_le16(IEEE80211_FTYPE_CTL |
IEEE80211_STYPE_RTS); IEEE80211_STYPE_RTS);
ether_addr_copy(buf->data.ra, hdr->addr1);
if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || ether_addr_copy(buf->data.ta, hdr->addr2);
(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);
} else { } else {
struct vnt_rts_g_fb *buf = pvRTS; struct vnt_rts_g_fb *buf = pvRTS;
/* Get SignalField, ServiceField & Length */ /* Get SignalField, ServiceField & Length */
...@@ -909,23 +895,8 @@ s_vFillRTSHead( ...@@ -909,23 +895,8 @@ s_vFillRTSHead(
cpu_to_le16(IEEE80211_FTYPE_CTL | cpu_to_le16(IEEE80211_FTYPE_CTL |
IEEE80211_STYPE_RTS); IEEE80211_STYPE_RTS);
ether_addr_copy(buf->data.ra, hdr->addr1);
if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || ether_addr_copy(buf->data.ta, hdr->addr2);
(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);
} // if (byFBOption == AUTO_FB_NONE) } // if (byFBOption == AUTO_FB_NONE)
} else if (byPktType == PK_TYPE_11A) { } else if (byPktType == PK_TYPE_11A) {
if (byFBOption == AUTO_FB_NONE) { if (byFBOption == AUTO_FB_NONE) {
...@@ -946,23 +917,8 @@ s_vFillRTSHead( ...@@ -946,23 +917,8 @@ s_vFillRTSHead(
cpu_to_le16(IEEE80211_FTYPE_CTL | cpu_to_le16(IEEE80211_FTYPE_CTL |
IEEE80211_STYPE_RTS); IEEE80211_STYPE_RTS);
ether_addr_copy(buf->data.ra, hdr->addr1);
if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || ether_addr_copy(buf->data.ta, hdr->addr2);
(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);
} else { } else {
struct vnt_rts_a_fb *buf = pvRTS; struct vnt_rts_a_fb *buf = pvRTS;
/* Get SignalField, ServiceField & Length */ /* Get SignalField, ServiceField & Length */
...@@ -991,20 +947,8 @@ s_vFillRTSHead( ...@@ -991,20 +947,8 @@ s_vFillRTSHead(
cpu_to_le16(IEEE80211_FTYPE_CTL | cpu_to_le16(IEEE80211_FTYPE_CTL |
IEEE80211_STYPE_RTS); IEEE80211_STYPE_RTS);
if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || ether_addr_copy(buf->data.ra, hdr->addr1);
(pDevice->op_mode == NL80211_IFTYPE_AP)) { ether_addr_copy(buf->data.ta, hdr->addr2);
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);
} }
} else if (byPktType == PK_TYPE_11B) { } else if (byPktType == PK_TYPE_11B) {
struct vnt_rts_ab *buf = pvRTS; struct vnt_rts_ab *buf = pvRTS;
...@@ -1023,19 +967,8 @@ s_vFillRTSHead( ...@@ -1023,19 +967,8 @@ s_vFillRTSHead(
buf->data.frame_control = buf->data.frame_control =
cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS); cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS);
if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || ether_addr_copy(buf->data.ra, hdr->addr1);
(pDevice->op_mode == NL80211_IFTYPE_AP)) { ether_addr_copy(buf->data.ta, hdr->addr2);
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);
} }
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或