redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

gianfar: Fix compile regression caused by 09f75cd7

Browse source 
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Li Yang 2007-10-16 14:18:13 +08:00 committed by Jeff Garzik
parent b3e441c6ed
commit 298e1a9ebe
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/gianfar.c
View file

@ -1237,8 +1237,6 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
* starting over will fix the problem. */ * starting over will fix the problem. */
static void gfar_timeout(struct net_device *dev) static void gfar_timeout(struct net_device *dev)
{ {
struct gfar_private *priv = netdev_priv(dev);
dev->stats.tx_errors++; dev->stats.tx_errors++;
if (dev->flags & IFF_UP) { if (dev->flags & IFF_UP) {
@ -1344,8 +1342,9 @@ struct sk_buff * gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp)
return skb; 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 net_device_stats *stats = &dev->stats;
struct gfar_extra_stats *estats = &priv->extra_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; dev->stats.rx_bytes += pkt_len;
} else { } else {
count_errors(bdp->status, priv); count_errors(bdp->status, dev);
if (skb) if (skb)
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);