From: Li Yang Date: Tue, 16 Oct 2007 06:18:13 +0000 (+0800) Subject: gianfar: Fix compile regression caused by 09f75cd7 X-Git-Tag: v2.6.24-rc1~819^2~8 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=298e1a9ebe37662f2145c07b678ebd09b86c020a;p=linux-2.6-omap-h63xx.git gianfar: Fix compile regression caused by 09f75cd7 Signed-off-by: Li Yang Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 558440c15b6..cc288d8f6a5 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -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) { @@ -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; @@ -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);