diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-08 21:24:46 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-08 21:24:46 +0200 |
| commit | d15a88fc21ef225768ce31be16edfc9c6e2e02e3 (patch) | |
| tree | d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d /drivers/net/pcmcia | |
| parent | Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux... (diff) | |
| parent | Linux 2.6.17-rc6 (diff) | |
| download | linux-d15a88fc21ef225768ce31be16edfc9c6e2e02e3.tar.xz linux-d15a88fc21ef225768ce31be16edfc9c6e2e02e3.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/pcmcia')
| -rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 4260c2128f47..a8f6bfc96fd2 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c @@ -1204,7 +1204,7 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt) dev->last_rx = jiffies; lp->linux_stats.rx_packets++; - lp->linux_stats.rx_bytes += skb->len; + lp->linux_stats.rx_bytes += pkt_len; outb(0xFF, ioaddr + AM2150_RCV_NEXT); /* skip to next frame */ continue; } else { |