Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 21:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Staging: vt6656: replaced IS_BROADCAST_ADDRESS with is_broadcast_ether_addr

Browse Source 
Replaced and removed the custom definition.
Minor checkpatch warnings on long lines and indentation were not cleared.

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andres More 2010-06-22 21:57:42 -03:00 committed by Greg Kroah-Hartman
parent 6cda24f5df
commit 4b50fb4042
7 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/vt6656/bssdb.c
View File

@ -135,7 +135,7 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
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;
} }

4
drivers/staging/vt6656/dpc.c
View File

@ -460,7 +460,7 @@ RXbBulkInProcessData (
} }
} }
if (!IS_MULTICAST_ADDRESS(pMACHeader->abyAddr1) && !IS_BROADCAST_ADDRESS(pMACHeader->abyAddr1)) { if (!is_multicast_ether_addr(pMACHeader->abyAddr1) && !is_broadcast_ether_addr(pMACHeader->abyAddr1)) {
if ( WCTLbIsDuplicate(&(pDevice->sDupRxCache), (PS802_11Header) pbyFrame) ) { if ( WCTLbIsDuplicate(&(pDevice->sDupRxCache), (PS802_11Header) pbyFrame) ) {
pDevice->s802_11Counter.FrameDuplicateCount++; pDevice->s802_11Counter.FrameDuplicateCount++;
return FALSE; return FALSE;
@ -1449,7 +1449,7 @@ static BOOL s_bAPModeRxData (
if (FrameSize > CB_MAX_BUF_SIZE) if (FrameSize > CB_MAX_BUF_SIZE)
return FALSE; return FALSE;
// check DA // check DA
if(IS_MULTICAST_ADDRESS((PBYTE)(skb->data+cbHeaderOffset))) { if (is_multicast_ether_addr((PBYTE)(skb->data+cbHeaderOffset))) {
if (pMgmt->sNodeDBTable[0].bPSEnable) { if (pMgmt->sNodeDBTable[0].bPSEnable) {
skbcpy = dev_alloc_skb((int)pDevice->rx_buf_sz); skbcpy = dev_alloc_skb((int)pDevice->rx_buf_sz);

2
drivers/staging/vt6656/iwctl.c
View File

@ -761,7 +761,7 @@ int iwctl_siwap(struct net_device *dev,
memcpy(pMgmt->abyDesireBSSID, wrq->sa_data, 6); memcpy(pMgmt->abyDesireBSSID, wrq->sa_data, 6);
//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;

2
drivers/staging/vt6656/key.c
View File

@ -402,7 +402,7 @@ BOOL KeybRemoveKey(
int i; int i;
BOOL bReturnValue = FALSE; BOOL bReturnValue = FALSE;
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++) {

24
drivers/staging/vt6656/rxtx.c
View File

@ -304,10 +304,9 @@ s_vSaveTxPktInfo(PSDevice pDevice, BYTE byPktNum, PBYTE pbyDestAddr, WORD wPktLe
{ {
PSStatCounter pStatistic=&(pDevice->scStatistic); PSStatCounter pStatistic=&(pDevice->scStatistic);
if (is_broadcast_ether_addr(pbyDestAddr))
if (IS_BROADCAST_ADDRESS(pbyDestAddr))
pStatistic->abyTxPktInfo[byPktNum].byBroadMultiUni = TX_PKT_BROAD; pStatistic->abyTxPktInfo[byPktNum].byBroadMultiUni = TX_PKT_BROAD;
else if (IS_MULTICAST_ADDRESS(pbyDestAddr)) else if (is_multicast_ether_addr(pbyDestAddr))
pStatistic->abyTxPktInfo[byPktNum].byBroadMultiUni = TX_PKT_MULTI; pStatistic->abyTxPktInfo[byPktNum].byBroadMultiUni = TX_PKT_MULTI;
else else
pStatistic->abyTxPktInfo[byPktNum].byBroadMultiUni = TX_PKT_UNI; pStatistic->abyTxPktInfo[byPktNum].byBroadMultiUni = TX_PKT_UNI;
@ -319,9 +318,6 @@ s_vSaveTxPktInfo(PSDevice pDevice, BYTE byPktNum, PBYTE pbyDestAddr, WORD wPktLe
ETH_ALEN); ETH_ALEN);
} }
static static
void void
s_vFillTxKey ( s_vFillTxKey (
@ -1494,8 +1490,8 @@ s_bPacketToWirelessUsb(
} else { //if (pDevice->dwDiagRefCount != 0) { } else { //if (pDevice->dwDiagRefCount != 0) {
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_ADDRESS(&(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);
} }
@ -2038,8 +2034,8 @@ CMD_STATUS csMgmt_xmit(
pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us); pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);
if (IS_MULTICAST_ADDRESS(&(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 {
@ -2447,8 +2443,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) {
pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us); pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);
if (IS_MULTICAST_ADDRESS(&(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;
@ -2783,7 +2779,7 @@ nsDMA_tx_packet(
return 0; return 0;
} }
if (IS_MULTICAST_ADDRESS((PBYTE)(skb->data))) { if (is_multicast_ether_addr((PBYTE)(skb->data))) {
uNodeIndex = 0; uNodeIndex = 0;
bNodeExist = TRUE; bNodeExist = TRUE;
if (pMgmt->sNodeDBTable[0].bPSEnable) { if (pMgmt->sNodeDBTable[0].bPSEnable) {
@ -2975,7 +2971,7 @@ nsDMA_tx_packet(
else { else {
if (pDevice->eOPMode == OP_MODE_ADHOC) { if (pDevice->eOPMode == OP_MODE_ADHOC) {
// Adhoc Tx rate decided from node DB // Adhoc Tx rate decided from node DB
if (IS_MULTICAST_ADDRESS(&(pDevice->sTxEthHeader.abyDstAddr[0]))) { if (is_multicast_ether_addr(&(pDevice->sTxEthHeader.abyDstAddr[0]))) {
// Multicast use highest data rate // Multicast use highest data rate
pDevice->wCurrentRate = pMgmt->sNodeDBTable[0].wTxDataRate; pDevice->wCurrentRate = pMgmt->sNodeDBTable[0].wTxDataRate;
// preamble type // preamble type

8
drivers/staging/vt6656/tether.h
View File

@ -199,14 +199,6 @@ S802_11Header, *PS802_11Header;
/*--------------------- Export Macros ------------------------------*/ /*--------------------- Export Macros ------------------------------*/
// Frame type macro // Frame type macro
#define IS_MULTICAST_ADDRESS(pbyEtherAddr) \
((*(PBYTE)(pbyEtherAddr) & 0x01) == 1)
#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) \

5
drivers/staging/vt6656/wpactl.c
View File

@ -348,9 +348,8 @@ int wpa_set_wpadev(PSDevice pDevice, int val)
return -EINVAL; return -EINVAL;
} }
if (is_broadcast_ether_addr(&param->addr[0]) || (param->addr == NULL)) {
if (IS_BROADCAST_ADDRESS(&param->addr[0]) || (param->addr == NULL)) { /* if broadcast, set the key as every key entry's group key */
// If IS_BROADCAST_ADDRESS, 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, if ((KeybSetAllGroupKey(pDevice,