Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd37b7fd authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

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: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 64328c87

drivers/staging/winbond/common.h

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/winbond/reg.c

+2 −3
Original line number Diff line number Diff line
@@ -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

drivers/staging/winbond/wb35reg.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/winbond/wbhal.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/winbond/wbhal_s.h

+3 −3
Original line number Diff line number Diff line
@@ -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