Skip to content

Commit

Permalink
gianfar: Fix compile regression caused by 09f75cd
Browse files Browse the repository at this point in the history
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Li Yang authored and Jeff Garzik committed Oct 17, 2007
1 parent b3e441c commit 298e1a9
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/net/gianfar.c
Original file line number Diff line number Diff line change
Expand Up @@ -1237,8 +1237,6 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
* starting over will fix the problem. */
static void gfar_timeout(struct net_device *dev)
{
struct gfar_private *priv = netdev_priv(dev);

dev->stats.tx_errors++;

if (dev->flags & IFF_UP) {
Expand Down Expand Up @@ -1344,8 +1342,9 @@ struct sk_buff * gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp)
return skb;
}

static inline void count_errors(unsigned short status, struct gfar_private *priv)
static inline void count_errors(unsigned short status, struct net_device *dev)
{
struct gfar_private *priv = netdev_priv(dev);
struct net_device_stats *stats = &dev->stats;
struct gfar_extra_stats *estats = &priv->extra_stats;

Expand Down Expand Up @@ -1539,7 +1538,7 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)

dev->stats.rx_bytes += pkt_len;
} else {
count_errors(bdp->status, priv);
count_errors(bdp->status, dev);

if (skb)
dev_kfree_skb_any(skb);
Expand Down

0 comments on commit 298e1a9

Please sign in to comment.