diff options
Diffstat (limited to 'drivers/net/amd8111e.c')
-rw-r--r-- | drivers/net/amd8111e.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 585c25f4b60c..58a0ab4923ee 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
@@ -396,7 +396,7 @@ static int amd8111e_set_coalesce(struct net_device * dev, enum coal_mode cmod) | |||
396 | event_count = coal_conf->rx_event_count; | 396 | event_count = coal_conf->rx_event_count; |
397 | if( timeout > MAX_TIMEOUT || | 397 | if( timeout > MAX_TIMEOUT || |
398 | event_count > MAX_EVENT_COUNT ) | 398 | event_count > MAX_EVENT_COUNT ) |
399 | return -EINVAL; | 399 | return -EINVAL; |
400 | 400 | ||
401 | timeout = timeout * DELAY_TIMER_CONV; | 401 | timeout = timeout * DELAY_TIMER_CONV; |
402 | writel(VAL0|STINTEN, mmio+INTEN0); | 402 | writel(VAL0|STINTEN, mmio+INTEN0); |
@@ -409,7 +409,7 @@ static int amd8111e_set_coalesce(struct net_device * dev, enum coal_mode cmod) | |||
409 | event_count = coal_conf->tx_event_count; | 409 | event_count = coal_conf->tx_event_count; |
410 | if( timeout > MAX_TIMEOUT || | 410 | if( timeout > MAX_TIMEOUT || |
411 | event_count > MAX_EVENT_COUNT ) | 411 | event_count > MAX_EVENT_COUNT ) |
412 | return -EINVAL; | 412 | return -EINVAL; |
413 | 413 | ||
414 | 414 | ||
415 | timeout = timeout * DELAY_TIMER_CONV; | 415 | timeout = timeout * DELAY_TIMER_CONV; |
@@ -903,18 +903,18 @@ static int amd8111e_read_mib(void __iomem *mmio, u8 MIB_COUNTER) | |||
903 | } | 903 | } |
904 | 904 | ||
905 | /* | 905 | /* |
906 | This function reads the mib registers and returns the hardware statistics. It updates previous internal driver statistics with new values. | 906 | * This function reads the mib registers and returns the hardware statistics. |
907 | */ | 907 | * It updates previous internal driver statistics with new values. |
908 | static struct net_device_stats *amd8111e_get_stats(struct net_device * dev) | 908 | */ |
909 | static struct net_device_stats *amd8111e_get_stats(struct net_device *dev) | ||
909 | { | 910 | { |
910 | struct amd8111e_priv *lp = netdev_priv(dev); | 911 | struct amd8111e_priv *lp = netdev_priv(dev); |
911 | void __iomem *mmio = lp->mmio; | 912 | void __iomem *mmio = lp->mmio; |
912 | unsigned long flags; | 913 | unsigned long flags; |
913 | /* struct net_device_stats *prev_stats = &lp->prev_stats; */ | 914 | struct net_device_stats *new_stats = &dev->stats; |
914 | struct net_device_stats* new_stats = &lp->stats; | ||
915 | 915 | ||
916 | if(!lp->opened) | 916 | if (!lp->opened) |
917 | return &lp->stats; | 917 | return new_stats; |
918 | spin_lock_irqsave (&lp->lock, flags); | 918 | spin_lock_irqsave (&lp->lock, flags); |
919 | 919 | ||
920 | /* stats.rx_packets */ | 920 | /* stats.rx_packets */ |