From 3e31e874b57d16f7e662482da066eb08163ae95e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles=20Cl=C3=A9ment?= Date: Wed, 19 May 2010 11:30:53 -0700 Subject: [PATCH] --- yaml --- r: 205577 b: refs/heads/master c: 8b0591e5017ea2a78f5181fd136e1b281323e5a3 h: refs/heads/master i: 205575: e3746c8d06aba5a90487113f543c81eb61cdaefc v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6655/card.c | 2 +- trunk/drivers/staging/vt6655/tether.h | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 4550eb5c870c..ec99978c6953 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca9e12acda7ab451ab481d29911af7ee27c512cf +refs/heads/master: 8b0591e5017ea2a78f5181fd136e1b281323e5a3 diff --git a/trunk/drivers/staging/vt6655/card.c b/trunk/drivers/staging/vt6655/card.c index 7bc2d7654b07..de5f2ba2cf46 100644 --- a/trunk/drivers/staging/vt6655/card.c +++ b/trunk/drivers/staging/vt6655/card.c @@ -1319,7 +1319,7 @@ BOOL CARDbSetBSSID(void *pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode) pDevice->byRxMode &= ~RCR_BSSID; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode ); } else { - if (IS_NULL_ADDRESS(pDevice->abyBSSID) == FALSE) { + if (is_zero_ether_addr(pDevice->abyBSSID) == FALSE) { MACvRegBitsOn(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID); pDevice->bBSSIDFilter = TRUE; pDevice->byRxMode |= RCR_BSSID; diff --git a/trunk/drivers/staging/vt6655/tether.h b/trunk/drivers/staging/vt6655/tether.h index e25ad4b47285..71ef0f1c898b 100644 --- a/trunk/drivers/staging/vt6655/tether.h +++ b/trunk/drivers/staging/vt6655/tether.h @@ -188,11 +188,6 @@ S802_11Header, *PS802_11Header; /*--------------------- Export Macros ------------------------------*/ // Frame type macro -#define IS_NULL_ADDRESS(pbyEtherAddr) ( \ - (*(PDWORD)(pbyEtherAddr) == 0L) && \ - (*(PWORD)((PBYTE)(pbyEtherAddr) + 4) == 0) \ -) - #define IS_ETH_ADDRESS_EQUAL(pbyAddr1, pbyAddr2) ( \ (*(PDWORD)(pbyAddr1) == *(PDWORD)(pbyAddr2)) && \ (*(PWORD)((PBYTE)(pbyAddr1) + 4) == \