From 981d5e7d0428e4b6190db0b94d221b6ed9b6cb50 Mon Sep 17 00:00:00 2001 From: Jonas Bonn Date: Thu, 25 Nov 2010 02:30:31 +0000 Subject: [PATCH] --- yaml --- r: 224521 b: refs/heads/master c: 4f64bcb2fc093a3a9d7d41220004491ce88e4dd3 h: refs/heads/master i: 224519: 5a79edb4c31c547e8d98c2457678139b32f4e30c v: v3 --- [refs] | 2 +- trunk/drivers/net/ethoc.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 84f1428fce1d..8912ac1d0107 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8dac428ae9ae54d8e8540ac157d92925dd7ebed8 +refs/heads/master: 4f64bcb2fc093a3a9d7d41220004491ce88e4dd3 diff --git a/trunk/drivers/net/ethoc.c b/trunk/drivers/net/ethoc.c index f3048faa3c66..93b50d674b1e 100644 --- a/trunk/drivers/net/ethoc.c +++ b/trunk/drivers/net/ethoc.c @@ -462,7 +462,7 @@ static int ethoc_rx(struct net_device *dev, int limit) return count; } -static int ethoc_update_tx_stats(struct ethoc *dev, struct ethoc_bd *bd) +static void ethoc_update_tx_stats(struct ethoc *dev, struct ethoc_bd *bd) { struct net_device *netdev = dev->netdev; @@ -492,7 +492,6 @@ static int ethoc_update_tx_stats(struct ethoc *dev, struct ethoc_bd *bd) netdev->stats.collisions += (bd->stat >> 4) & 0xf; netdev->stats.tx_bytes += bd->stat >> 16; netdev->stats.tx_packets++; - return 0; } static int ethoc_tx(struct net_device *dev, int limit) @@ -523,7 +522,7 @@ static int ethoc_tx(struct net_device *dev, int limit) break; } - (void)ethoc_update_tx_stats(priv, &bd); + ethoc_update_tx_stats(priv, &bd); priv->dty_tx++; }