Staging: vt6655: simplify broadcast and multicast ethernet address test
A broadcast address is also a multicast address so simplify test cases where possible. As suggested by Joe Perches. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
5583dcf587
commit
388bf2e8fe
|
@ -443,7 +443,7 @@ device_receive_frame (
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_multicast_ether_addr(pbyFrame) && !is_broadcast_ether_addr(pbyFrame)) {
|
if (!is_multicast_ether_addr(pbyFrame)) {
|
||||||
if (WCTLbIsDuplicate(&(pDevice->sDupRxCache), (PS802_11Header) (skb->data + 4))) {
|
if (WCTLbIsDuplicate(&(pDevice->sDupRxCache), (PS802_11Header) (skb->data + 4))) {
|
||||||
pDevice->s802_11Counter.FrameDuplicateCount++;
|
pDevice->s802_11Counter.FrameDuplicateCount++;
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
|
@ -1372,13 +1372,10 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT
|
||||||
if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
|
if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
|
||||||
(pDevice->eOPMode == OP_MODE_AP)) {
|
(pDevice->eOPMode == OP_MODE_AP)) {
|
||||||
|
|
||||||
if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0])) ||
|
if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0])))
|
||||||
is_broadcast_ether_addr(&(psEthHeader->abyDstAddr[0]))) {
|
bNeedACK = FALSE;
|
||||||
bNeedACK = FALSE;
|
else
|
||||||
}
|
|
||||||
else {
|
|
||||||
bNeedACK = TRUE;
|
bNeedACK = TRUE;
|
||||||
}
|
|
||||||
bIsAdhoc = TRUE;
|
bIsAdhoc = TRUE;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -2091,8 +2088,7 @@ vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pb
|
||||||
|
|
||||||
if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
|
if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
|
||||||
(pDevice->eOPMode == OP_MODE_AP)) {
|
(pDevice->eOPMode == OP_MODE_AP)) {
|
||||||
if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0])) ||
|
if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0]))) {
|
||||||
is_broadcast_ether_addr(&(psEthHeader->abyDstAddr[0]))) {
|
|
||||||
bNeedACK = FALSE;
|
bNeedACK = FALSE;
|
||||||
pTxBufHead->wFIFOCtl = pTxBufHead->wFIFOCtl & (~FIFOCTL_NEEDACK);
|
pTxBufHead->wFIFOCtl = pTxBufHead->wFIFOCtl & (~FIFOCTL_NEEDACK);
|
||||||
}
|
}
|
||||||
|
@ -2392,10 +2388,8 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
|
||||||
pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);
|
pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);
|
||||||
|
|
||||||
|
|
||||||
if (is_multicast_ether_addr(&(pPacket->p80211Header->sA3.abyAddr1[0])) ||
|
if (is_multicast_ether_addr(&(pPacket->p80211Header->sA3.abyAddr1[0])))
|
||||||
is_broadcast_ether_addr(&(pPacket->p80211Header->sA3.abyAddr1[0]))) {
|
|
||||||
bNeedACK = FALSE;
|
bNeedACK = FALSE;
|
||||||
}
|
|
||||||
else {
|
else {
|
||||||
bNeedACK = TRUE;
|
bNeedACK = TRUE;
|
||||||
pTxBufHead->wFIFOCtl |= FIFOCTL_NEEDACK;
|
pTxBufHead->wFIFOCtl |= FIFOCTL_NEEDACK;
|
||||||
|
@ -2728,13 +2722,10 @@ cbGetFragCount (
|
||||||
|
|
||||||
if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
|
if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
|
||||||
(pDevice->eOPMode == OP_MODE_AP)) {
|
(pDevice->eOPMode == OP_MODE_AP)) {
|
||||||
if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0])) ||
|
if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0])))
|
||||||
is_broadcast_ether_addr(&(psEthHeader->abyDstAddr[0]))) {
|
|
||||||
bNeedACK = FALSE;
|
bNeedACK = FALSE;
|
||||||
}
|
else
|
||||||
else {
|
|
||||||
bNeedACK = TRUE;
|
bNeedACK = TRUE;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// MSDUs in Infra mode always need ACK
|
// MSDUs in Infra mode always need ACK
|
||||||
|
@ -2906,8 +2897,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un
|
||||||
pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);
|
pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);
|
||||||
|
|
||||||
|
|
||||||
if (is_multicast_ether_addr(&(p80211Header->sA3.abyAddr1[0])) ||
|
if (is_multicast_ether_addr(&(p80211Header->sA3.abyAddr1[0]))) {
|
||||||
is_broadcast_ether_addr(&(p80211Header->sA3.abyAddr1[0]))) {
|
|
||||||
bNeedACK = FALSE;
|
bNeedACK = FALSE;
|
||||||
if (pDevice->bEnableHostWEP) {
|
if (pDevice->bEnableHostWEP) {
|
||||||
uNodeIndex = 0;
|
uNodeIndex = 0;
|
||||||
|
|
Loading…
Reference in a new issue