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

Commit 449e39d9 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

igbvf: Use ETH_ALEN 



Remove an unnecessary #define and use memcpy
instead of a loop to copy an ethernet address.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c81f2124

drivers/net/ethernet/intel/igbvf/defines.h

+0 −4
Original line number Diff line number Diff line
@@ -97,10 +97,6 @@ 
#define E1000_ERR_MAC_INIT 5

#define E1000_ERR_MBX      15



#ifndef ETH_ADDR_LEN

#define ETH_ADDR_LEN                 6

#endif



/* SRRCTL bit definitions */

#define E1000_SRRCTL_BSIZEPKT_SHIFT                     10 /* Shift _right_ */

#define E1000_SRRCTL_BSIZEHDRSIZE_MASK                  0x00000F00

drivers/net/ethernet/intel/igbvf/vf.c

+2 −5
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static void e1000_update_mc_addr_list_vf(struct e1000_hw *hw, 
	for (i = 0; i < cnt; i++) {

		hash_value = e1000_hash_mc_addr_vf(hw, mc_addr_list);

		hash_list[i] = hash_value & 0x0FFFF;

		mc_addr_list += ETH_ADDR_LEN;

		mc_addr_list += ETH_ALEN;

	}



	mbx->ops.write_posted(hw, msgbuf, E1000_VFMAILBOX_SIZE);
@@ -333,10 +333,7 @@ static void e1000_rar_set_vf(struct e1000_hw *hw, u8 * addr, u32 index) 
 **/

static s32 e1000_read_mac_addr_vf(struct e1000_hw *hw)

{

	int i;



	for (i = 0; i < ETH_ADDR_LEN; i++)

		hw->mac.addr[i] = hw->mac.perm_addr[i];

	memcpy(hw->mac.addr, hw->mac.perm_addr, ETH_ALEN);



	return E1000_SUCCESS;

}