From 5d24bc3df0a8a1eb11d6992b9d2009fbe75f7286 Mon Sep 17 00:00:00 2001 From: Scott Feldman Date: Mon, 9 Feb 2009 23:24:08 -0800 Subject: [PATCH] --- yaml --- r: 134360 b: refs/heads/master c: bd9fb1a44a5c52a1c322ebacd08f6b7416a40a86 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/enic/enic.h | 1 + trunk/drivers/net/enic/enic_main.c | 10 +++------- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ea284e84e3b7..d9adeb0a5958 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed8af6b288c0643dfe0ad91f1bfc8c56c0d307cc +refs/heads/master: bd9fb1a44a5c52a1c322ebacd08f6b7416a40a86 diff --git a/trunk/drivers/net/enic/enic.h b/trunk/drivers/net/enic/enic.h index 86b8c15b4d3e..c26cea0b300e 100644 --- a/trunk/drivers/net/enic/enic.h +++ b/trunk/drivers/net/enic/enic.h @@ -97,6 +97,7 @@ struct enic { ____cacheline_aligned struct vnic_rq rq[1]; unsigned int rq_count; int (*rq_alloc_buf)(struct vnic_rq *rq); + u64 rq_bad_fcs; struct napi_struct napi; struct net_lro_mgr lro_mgr; struct net_lro_desc lro_desc[ENIC_LRO_MAX_DESC]; diff --git a/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c index e9bc79a6f303..798cf506bffd 100644 --- a/trunk/drivers/net/enic/enic_main.c +++ b/trunk/drivers/net/enic/enic_main.c @@ -688,7 +688,7 @@ static struct net_device_stats *enic_get_stats(struct net_device *netdev) net_stats->rx_bytes = stats->rx.rx_bytes_ok; net_stats->rx_errors = stats->rx.rx_errors; net_stats->multicast = stats->rx.rx_multicast_frames_ok; - net_stats->rx_crc_errors = stats->rx.rx_crc_errors; + net_stats->rx_crc_errors = enic->rq_bad_fcs; net_stats->rx_dropped = stats->rx.rx_no_bufs; return net_stats; @@ -933,12 +933,8 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq, if (packet_error) { - if (bytes_written > 0 && !fcs_ok) { - if (net_ratelimit()) - printk(KERN_ERR PFX - "%s: packet error: bad FCS\n", - netdev->name); - } + if (bytes_written > 0 && !fcs_ok) + enic->rq_bad_fcs++; dev_kfree_skb_any(skb);