lkml.org 
[lkml]   [2012]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/4] igbvf: Use ETH_ALEN
    Date
    Remove an unnecessary #define and use memcpy
    instead of a loop to copy an ethernet address.

    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    drivers/net/ethernet/intel/igbvf/defines.h | 4 ----
    drivers/net/ethernet/intel/igbvf/vf.c | 7 ++-----
    2 files changed, 2 insertions(+), 9 deletions(-)

    diff --git a/drivers/net/ethernet/intel/igbvf/defines.h b/drivers/net/ethernet/intel/igbvf/defines.h
    index 33f40d3..3e18045 100644
    --- a/drivers/net/ethernet/intel/igbvf/defines.h
    +++ b/drivers/net/ethernet/intel/igbvf/defines.h
    @@ -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
    diff --git a/drivers/net/ethernet/intel/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c
    index 1955197..30a6cc4 100644
    --- a/drivers/net/ethernet/intel/igbvf/vf.c
    +++ b/drivers/net/ethernet/intel/igbvf/vf.c
    @@ -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;
    }
    --
    1.7.8.111.gad25c.dirty


    \
     
     \ /
      Last update: 2012-03-19 04:41    [W:0.020 / U:30.856 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site