Staging: w35und: convert code to use ETH_ALEN

As suggested by Harvey Harrison, convert driver to use ETH_ALEN and kill a
private macro from common.h that is used for the same thing.

Acked-by: Harvey Harrison <harvey.harrison@gmail.com>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/winbond/common.h b/drivers/staging/winbond/common.h
index c4d96041e9ac64a24bab79b9ed729b3fefe371af..61ccc869a6ed07f88c44385e109048a9bdf3f400 100644 (file)
--- a/drivers/staging/winbond/common.h
+++ b/drivers/staging/winbond/common.h
@@ -16,7 +16,6 @@
 // Common function definition
 //==================================================================================================
 #define DEBUG_ENABLED
-#define ETH_LENGTH_OF_ADDRESS  6
 #ifdef DEBUG_ENABLED
 #define WBDEBUG( _M )  printk _M
 #else

diff --git a/drivers/staging/winbond/reg.c b/drivers/staging/winbond/reg.c
index c365c5d1b7658f0f83080a6b4f0c6fbcb445fc64..ed08e0051d72c8bdc8c5d0c30b77d6d4d5e112be 100644 (file)
--- a/drivers/staging/winbond/reg.c
+++ b/drivers/staging/winbond/reg.c
@@ -948,14 +948,13 @@ Uxx_ReadEthernetAddress(  phw_data_t pHwData )
 //  Return Value:
 //    None.
 //==============================================================================================================
-void CardGetMulticastBit(   u8 Address[ETH_LENGTH_OF_ADDRESS],
-                                                  u8 *Byte,  u8 *Value )
+void CardGetMulticastBit( u8 Address[ETH_ALEN], u8 *Byte, u8 *Value )
 {
     u32 Crc;
     u32 BitNumber;
 
     // First compute the CRC.
-    Crc = CardComputeCrc(Address, ETH_LENGTH_OF_ADDRESS);
+    Crc = CardComputeCrc(Address, ETH_ALEN);
 
        // The computed CRC is bit0~31 from left to right
        //At first we should do right shift 25bits, and read 7bits by using '&', 2^7=128

diff --git a/drivers/staging/winbond/wb35reg.c b/drivers/staging/winbond/wb35reg.c
index c74b3fdcbda0d87c6646a037ea16b0dc9f7f4380..87c2c431b42bdfb6d38b949740249a0e691a2366 100644 (file)
--- a/drivers/staging/winbond/wb35reg.c
+++ b/drivers/staging/winbond/wb35reg.c
@@ -599,7 +599,7 @@ unsigned char Wb35Reg_initial(phw_data_t pHwData)
        Wb35Reg_ReadSync( pHwData, 0x03b4, &Region_ScanInterval );
 
        // Update Ethernet address
-       memcpy( pHwData->CurrentMacAddress, pHwData->PermanentMacAddress, ETH_LENGTH_OF_ADDRESS );
+       memcpy( pHwData->CurrentMacAddress, pHwData->PermanentMacAddress, ETH_ALEN );
 
        // Update software variable
        pHwData->SoftwareSet = (u16)(SoftwareSet & 0xffff);

diff --git a/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c
index d7bbb9a40ef6b9e25b6f95895da56012350aa6b1..a2cc0776fc636ee55addee855bcacab8509e849e 100644 (file)
--- a/drivers/staging/winbond/wbhal.c
+++ b/drivers/staging/winbond/wbhal.c
@@ -8,7 +8,7 @@ void hal_set_ethernet_address( phw_data_t pHwData, u8 *current_address )
 
        if( pHwData->SurpriseRemove ) return;
 
-       memcpy( pHwData->CurrentMacAddress, current_address, ETH_LENGTH_OF_ADDRESS );
+       memcpy( pHwData->CurrentMacAddress, current_address, ETH_ALEN );
 
        ltmp[0]= cpu_to_le32( *(u32 *)pHwData->CurrentMacAddress );
        ltmp[1]= cpu_to_le32( *(u32 *)(pHwData->CurrentMacAddress + 4) ) & 0xffff;

diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h
index 276d2b12632f2e43d8e9b6ab232d50cf0623e734..9353ac259e81176d53d87a236a888ce5ffb4585e 100644 (file)
--- a/drivers/staging/winbond/wbhal_s.h
+++ b/drivers/staging/winbond/wbhal_s.h
@@ -2,6 +2,7 @@
 #define __WINBOND_WBHAL_S_H
 
 #include <linux/types.h>
+#include <linux/if_ether.h> /* for ETH_ALEN */
 
 #include "common.h"
 
@@ -427,7 +428,6 @@ typedef struct _TXVGA_FOR_50 {
 #include "wb35tx_s.h"
 #include "wb35rx_s.h"
 
-
 // For Hal using ==================================================================
 typedef struct _HW_DATA_T
 {
@@ -452,8 +452,8 @@ typedef struct _HW_DATA_T
        //===============================================
        // Definition for MAC address
        //===============================================
-       u8              PermanentMacAddress[ETH_LENGTH_OF_ADDRESS + 2]; // The Enthernet addr that are stored in EEPROM.  + 2 to 8-byte alignment
-       u8              CurrentMacAddress[ETH_LENGTH_OF_ADDRESS + 2]; // The Enthernet addr that are in used.  + 2 to 8-byte alignment
+       u8              PermanentMacAddress[ETH_ALEN + 2]; // The Enthernet addr that are stored in EEPROM.  + 2 to 8-byte alignment
+       u8              CurrentMacAddress[ETH_ALEN + 2]; // The Enthernet addr that are in used.  + 2 to 8-byte alignment
 
        //=====================================================================
        // Definition for 802.11