Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / mellanox / mlx4 / mlx4_en.h

diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index fe8146d68b0a33be6e14b9192b8c8f58602d2874..fca66165110ef95e8d4e57ac2be1157893696480 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -51,8 +51,8 @@
 #include "en_port.h"
 
 #define DRV_NAME       "mlx4_en"
-#define DRV_VERSION    "1.5.4.1"
-#define DRV_RELDATE    "March 2011"
+#define DRV_VERSION    "1.5.4.2"
+#define DRV_RELDATE    "October 2011"
 
 #define MLX4_EN_MSG_LEVEL      (NETIF_MSG_LINK | NETIF_MSG_IFDOWN)
 
@@ -249,6 +249,7 @@ struct mlx4_en_tx_ring {
        struct mlx4_srq dummy;
        unsigned long bytes;
        unsigned long packets;
+       unsigned long tx_csum;
        spinlock_t comp_lock;
        struct mlx4_bf bf;
        bool bf_enabled;
@@ -275,6 +276,8 @@ struct mlx4_en_rx_ring {
        void *rx_info;
        unsigned long bytes;
        unsigned long packets;
+       unsigned long csum_ok;
+       unsigned long csum_none;
 };
 
 
@@ -426,11 +429,11 @@ struct mlx4_en_priv {
        struct mlx4_en_port_state port_state;
        spinlock_t stats_lock;
 
-       unsigned long last_moder_packets;
+       unsigned long last_moder_packets[MAX_RX_RINGS];
        unsigned long last_moder_tx_packets;
-       unsigned long last_moder_bytes;
+       unsigned long last_moder_bytes[MAX_RX_RINGS];
        unsigned long last_moder_jiffies;
-       int last_moder_time;
+       int last_moder_time[MAX_RX_RINGS];
        u16 rx_usecs;
        u16 rx_frames;
        u16 tx_usecs;