enic: bug fix: included MAC drops in rx_dropped netstat

Bug fix: included MAC drops in rx_dropped netstat.  Also track Rx trunctations
stat at the MAC

Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index cfe94b2e03af2d1c85e36580a396feb47e29e82d..f7c5b334bc79ca31276c21192f3f1b8b49971d37 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -99,6 +99,7 @@ struct enic {
        ____cacheline_aligned struct vnic_rq rq[1];
        unsigned int rq_count;
        int (*rq_alloc_buf)(struct vnic_rq *rq);
+       u64 rq_truncated_pkts;
        u64 rq_bad_fcs;
        struct napi_struct napi;
        struct net_lro_mgr lro_mgr;

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 36cf0fcc66feea969524371c6501e6a18cce26f6..b265b103c2109eb33b5b27330e121d5695b6182a 100644 (file)
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -738,8 +738,9 @@ 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_over_errors = enic->rq_truncated_pkts;
        net_stats->rx_crc_errors = enic->rq_bad_fcs;
-       net_stats->rx_dropped = stats->rx.rx_no_bufs;
+       net_stats->rx_dropped = stats->rx.rx_no_bufs + stats->rx.rx_drop;
 
        return net_stats;
 }
@@ -1029,8 +1030,12 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
 
        if (packet_error) {
 
-               if (bytes_written > 0 && !fcs_ok)
-                       enic->rq_bad_fcs++;
+               if (!fcs_ok) {
+                       if (bytes_written > 0)
+                               enic->rq_bad_fcs++;
+                       else if (bytes_written == 0)
+                               enic->rq_truncated_pkts++;
+               }
 
                dev_kfree_skb_any(skb);