forked from Minki/linux
Staging: vt6655: use is_broadcast_ether_addr instead of custom macro
Replace custom macro IS_BROADCAST_ADDRESS by is_broadcast_ether_addr from <linux/etherdevice.h>. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
670ea81ead
commit
ca9e12acda
@ -144,7 +144,7 @@ BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00};
|
|||||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n",
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n",
|
||||||
*pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2),
|
*pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2),
|
||||||
*(pbyDesireBSSID+3),*(pbyDesireBSSID+4),*(pbyDesireBSSID+5));
|
*(pbyDesireBSSID+3),*(pbyDesireBSSID+4),*(pbyDesireBSSID+5));
|
||||||
if ((!IS_BROADCAST_ADDRESS(pbyDesireBSSID)) &&
|
if ((!is_broadcast_ether_addr(pbyDesireBSSID)) &&
|
||||||
(memcmp(pbyDesireBSSID, ZeroBSSID, 6)!= 0)){
|
(memcmp(pbyDesireBSSID, ZeroBSSID, 6)!= 0)){
|
||||||
pbyBSSID = pbyDesireBSSID;
|
pbyBSSID = pbyDesireBSSID;
|
||||||
}
|
}
|
||||||
|
@ -463,7 +463,7 @@ device_receive_frame (
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_multicast_ether_addr(pbyFrame) && !IS_BROADCAST_ADDRESS(pbyFrame)) {
|
if (!is_multicast_ether_addr(pbyFrame) && !is_broadcast_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;
|
||||||
|
@ -706,7 +706,7 @@ if (pMgmt->eScanState == WMAC_IS_SCANNING) {
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
//mike :add
|
//mike :add
|
||||||
if ((IS_BROADCAST_ADDRESS(pMgmt->abyDesireBSSID)) ||
|
if ((is_broadcast_ether_addr(pMgmt->abyDesireBSSID)) ||
|
||||||
(memcmp(pMgmt->abyDesireBSSID, ZeroBSSID, 6) == 0)){
|
(memcmp(pMgmt->abyDesireBSSID, ZeroBSSID, 6) == 0)){
|
||||||
PRINT_K("SIOCSIWAP:invalid desired BSSID return!\n");
|
PRINT_K("SIOCSIWAP:invalid desired BSSID return!\n");
|
||||||
return rc;
|
return rc;
|
||||||
|
@ -371,7 +371,7 @@ BOOL KeybRemoveKey (
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (IS_BROADCAST_ADDRESS(pbyBSSID)) {
|
if (is_broadcast_ether_addr(pbyBSSID)) {
|
||||||
// dealte all key
|
// dealte all key
|
||||||
if ((dwKeyIndex & PAIRWISE_KEY) != 0) {
|
if ((dwKeyIndex & PAIRWISE_KEY) != 0) {
|
||||||
for (i=0;i<MAX_KEY_TABLE;i++) {
|
for (i=0;i<MAX_KEY_TABLE;i++) {
|
||||||
|
@ -471,7 +471,7 @@ STAvUpdateTDStatCounter (
|
|||||||
pStatistic->CustomStat.ullTsrAllOK =
|
pStatistic->CustomStat.ullTsrAllOK =
|
||||||
(pStatistic->ullTsrOK[TYPE_AC0DMA] + pStatistic->ullTsrOK[TYPE_TXDMA0]);
|
(pStatistic->ullTsrOK[TYPE_AC0DMA] + pStatistic->ullTsrOK[TYPE_TXDMA0]);
|
||||||
// update counters in case that successful transmit
|
// update counters in case that successful transmit
|
||||||
if (IS_BROADCAST_ADDRESS(pbyDestAddr)) {
|
if (is_broadcast_ether_addr(pbyDestAddr)) {
|
||||||
pStatistic->ullTxBroadcastFrames[uIdx]++;
|
pStatistic->ullTxBroadcastFrames[uIdx]++;
|
||||||
pStatistic->ullTxBroadcastBytes[uIdx] += (ULONGLONG)cbFrameLength;
|
pStatistic->ullTxBroadcastBytes[uIdx] += (ULONGLONG)cbFrameLength;
|
||||||
}
|
}
|
||||||
@ -495,7 +495,7 @@ STAvUpdateTDStatCounter (
|
|||||||
pStatistic->dwTsrACKData[uIdx]++;
|
pStatistic->dwTsrACKData[uIdx]++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_BROADCAST_ADDRESS(pbyDestAddr))
|
if (is_broadcast_ether_addr(pbyDestAddr))
|
||||||
pStatistic->dwTsrBroadcast[uIdx]++;
|
pStatistic->dwTsrBroadcast[uIdx]++;
|
||||||
else if (is_multicast_ether_addr(pbyDestAddr))
|
else if (is_multicast_ether_addr(pbyDestAddr))
|
||||||
pStatistic->dwTsrMulticast[uIdx]++;
|
pStatistic->dwTsrMulticast[uIdx]++;
|
||||||
|
@ -1395,7 +1395,7 @@ s_cbFillTxBufHead (
|
|||||||
(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_ADDRESS(&(psEthHeader->abyDstAddr[0]))) {
|
is_broadcast_ether_addr(&(psEthHeader->abyDstAddr[0]))) {
|
||||||
bNeedACK = FALSE;
|
bNeedACK = FALSE;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -2124,7 +2124,7 @@ vGenerateFIFOHeader (
|
|||||||
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_ADDRESS(&(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);
|
||||||
}
|
}
|
||||||
@ -2425,7 +2425,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
|
|||||||
|
|
||||||
|
|
||||||
if (is_multicast_ether_addr(&(pPacket->p80211Header->sA3.abyAddr1[0])) ||
|
if (is_multicast_ether_addr(&(pPacket->p80211Header->sA3.abyAddr1[0])) ||
|
||||||
IS_BROADCAST_ADDRESS(&(pPacket->p80211Header->sA3.abyAddr1[0]))) {
|
is_broadcast_ether_addr(&(pPacket->p80211Header->sA3.abyAddr1[0]))) {
|
||||||
bNeedACK = FALSE;
|
bNeedACK = FALSE;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -2761,7 +2761,7 @@ 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_ADDRESS(&(psEthHeader->abyDstAddr[0]))) {
|
is_broadcast_ether_addr(&(psEthHeader->abyDstAddr[0]))) {
|
||||||
bNeedACK = FALSE;
|
bNeedACK = FALSE;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -2939,7 +2939,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
|
|||||||
|
|
||||||
|
|
||||||
if (is_multicast_ether_addr(&(p80211Header->sA3.abyAddr1[0])) ||
|
if (is_multicast_ether_addr(&(p80211Header->sA3.abyAddr1[0])) ||
|
||||||
IS_BROADCAST_ADDRESS(&(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;
|
||||||
|
@ -188,11 +188,6 @@ S802_11Header, *PS802_11Header;
|
|||||||
/*--------------------- Export Macros ------------------------------*/
|
/*--------------------- Export Macros ------------------------------*/
|
||||||
// Frame type macro
|
// Frame type macro
|
||||||
|
|
||||||
#define IS_BROADCAST_ADDRESS(pbyEtherAddr) ( \
|
|
||||||
(*(PDWORD)(pbyEtherAddr) == 0xFFFFFFFFL) && \
|
|
||||||
(*(PWORD)((PBYTE)(pbyEtherAddr) + 4) == 0xFFFF) \
|
|
||||||
)
|
|
||||||
|
|
||||||
#define IS_NULL_ADDRESS(pbyEtherAddr) ( \
|
#define IS_NULL_ADDRESS(pbyEtherAddr) ( \
|
||||||
(*(PDWORD)(pbyEtherAddr) == 0L) && \
|
(*(PDWORD)(pbyEtherAddr) == 0L) && \
|
||||||
(*(PWORD)((PBYTE)(pbyEtherAddr) + 4) == 0) \
|
(*(PWORD)((PBYTE)(pbyEtherAddr) + 4) == 0) \
|
||||||
|
@ -351,8 +351,8 @@ spin_lock_irq(&pDevice->lock);
|
|||||||
}
|
}
|
||||||
|
|
||||||
// spin_lock_irq(&pDevice->lock);
|
// spin_lock_irq(&pDevice->lock);
|
||||||
if (IS_BROADCAST_ADDRESS(¶m->addr[0]) || (param->addr == NULL)) {
|
if (is_broadcast_ether_addr(¶m->addr[0]) || (param->addr == NULL)) {
|
||||||
// If IS_BROADCAST_ADDRESS, set the key as every key entry's group key.
|
// If is_broadcast_ether_addr, set the key as every key entry's group key.
|
||||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Groupe Key Assign.\n");
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Groupe Key Assign.\n");
|
||||||
|
|
||||||
if ((KeybSetAllGroupKey(&(pDevice->sKey),
|
if ((KeybSetAllGroupKey(&(pDevice->sKey),
|
||||||
|
Loading…
Reference in New Issue
Block a user