UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

igbvf: Use ETH_ALEN 

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

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2012-03-18 17:37:58 +00:00 committed by David S. Miller
parent c81f212450
commit 449e39d9d7
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/intel/igbvf/defines.h
View File

@ -97,10 +97,6 @@
#define E1000_ERR_MAC_INIT 5 #define E1000_ERR_MAC_INIT 5
#define E1000_ERR_MBX 15 #define E1000_ERR_MBX 15
#ifndef ETH_ADDR_LEN
#define ETH_ADDR_LEN 6
#endif
/* SRRCTL bit definitions */ /* SRRCTL bit definitions */
#define E1000_SRRCTL_BSIZEPKT_SHIFT 10 /* Shift _right_ */ #define E1000_SRRCTL_BSIZEPKT_SHIFT 10 /* Shift _right_ */
#define E1000_SRRCTL_BSIZEHDRSIZE_MASK 0x00000F00 #define E1000_SRRCTL_BSIZEHDRSIZE_MASK 0x00000F00

7
drivers/net/ethernet/intel/igbvf/vf.c
View File

@ -246,7 +246,7 @@ static void e1000_update_mc_addr_list_vf(struct e1000_hw *hw,
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
hash_value = e1000_hash_mc_addr_vf(hw, mc_addr_list); hash_value = e1000_hash_mc_addr_vf(hw, mc_addr_list);
hash_list[i] = hash_value & 0x0FFFF; 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); 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) static s32 e1000_read_mac_addr_vf(struct e1000_hw *hw)
{ {
int i; memcpy(hw->mac.addr, hw->mac.perm_addr, ETH_ALEN);
for (i = 0; i < ETH_ADDR_LEN; i++)
hw->mac.addr[i] = hw->mac.perm_addr[i];
return E1000_SUCCESS; return E1000_SUCCESS;
} }