lkml.org 
[lkml]   [2011]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next 4/5] amd8111e: Convert ETH_ADDR_LEN uses to ETH_ALEN
    Date
    Reduce the number of #defines, use the normal #define from if_ether.h

    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    drivers/net/ethernet/amd/amd8111e.c | 6 +++---
    drivers/net/ethernet/amd/amd8111e.h | 1 -
    2 files changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
    index a388118..33e0a8c 100644
    --- a/drivers/net/ethernet/amd/amd8111e.c
    +++ b/drivers/net/ethernet/amd/amd8111e.c
    @@ -499,7 +499,7 @@ static int amd8111e_restart(struct net_device *dev)
    writel( VAL0 | APAD_XMT | REX_RTRY, mmio + CMD2 );

    /* Setting the MAC address to the device */
    - for(i = 0; i < ETH_ADDR_LEN; i++)
    + for (i = 0; i < ETH_ALEN; i++)
    writeb( dev->dev_addr[i], mmio + PADR + i );

    /* Enable interrupt coalesce */
    @@ -1550,7 +1550,7 @@ static int amd8111e_set_mac_address(struct net_device *dev, void *p)
    memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
    spin_lock_irq(&lp->lock);
    /* Setting the MAC address to the device */
    - for(i = 0; i < ETH_ADDR_LEN; i++)
    + for (i = 0; i < ETH_ALEN; i++)
    writeb( dev->dev_addr[i], lp->mmio + PADR + i );

    spin_unlock_irq(&lp->lock);
    @@ -1886,7 +1886,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
    }

    /* Initializing MAC address */
    - for(i = 0; i < ETH_ADDR_LEN; i++)
    + for (i = 0; i < ETH_ALEN; i++)
    dev->dev_addr[i] = readb(lp->mmio + PADR + i);

    /* Setting user defined parametrs */
    diff --git a/drivers/net/ethernet/amd/amd8111e.h b/drivers/net/ethernet/amd/amd8111e.h
    index 2ff2e7a..5bbb53a 100644
    --- a/drivers/net/ethernet/amd/amd8111e.h
    +++ b/drivers/net/ethernet/amd/amd8111e.h
    @@ -586,7 +586,6 @@ typedef enum {

    #define PKT_BUFF_SZ 1536
    #define MIN_PKT_LEN 60
    -#define ETH_ADDR_LEN 6

    #define AMD8111E_TX_TIMEOUT (3 * HZ)/* 3 sec */
    #define SOFT_TIMER_FREQ 0xBEBC /* 0.5 sec */
    --
    1.7.6.405.gc1be0


    \
     
     \ /
      Last update: 2011-11-16 20:41    [W:4.168 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site