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

[deliverable/linux.git] / drivers / net / igb / igb.h

diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h
index 4e8464b9df2e4af277b3d532c59e88612fb062a0..b2c98dea9eed4c01bd0bbfbdf750d1231b53c66e 100644 (file)
--- a/drivers/net/igb/igb.h
+++ b/drivers/net/igb/igb.h
@@ -137,11 +137,17 @@ struct igb_buffer {
        };
 };
 
-struct igb_queue_stats {
+struct igb_tx_queue_stats {
        u64 packets;
        u64 bytes;
 };
 
+struct igb_rx_queue_stats {
+       u64 packets;
+       u64 bytes;
+       u64 drops;
+};
+
 struct igb_ring {
        struct igb_adapter *adapter; /* backlink */
        void *desc;                  /* descriptor ring memory */
@@ -167,12 +173,13 @@ struct igb_ring {
        union {
                /* TX */
                struct {
-                       struct igb_queue_stats tx_stats;
+                       struct igb_tx_queue_stats tx_stats;
                        bool detect_tx_hung;
                };
                /* RX */
                struct {
-                       struct igb_queue_stats rx_stats;
+                       struct igb_rx_queue_stats rx_stats;
+                       u64 rx_queue_drops;
                        struct napi_struct napi;
                        int set_itr;
                        struct igb_ring *buddy;
@@ -238,7 +245,6 @@ struct igb_adapter {
        u64 hw_csum_err;
        u64 hw_csum_good;
        u32 alloc_rx_buff_failed;
-       bool rx_csum;
        u32 gorc;
        u64 gorc_old;
        u16 rx_ps_hdr_size;
@@ -286,6 +292,7 @@ struct igb_adapter {
 #define IGB_FLAG_DCA_ENABLED       (1 << 1)
 #define IGB_FLAG_QUAD_PORT_A       (1 << 2)
 #define IGB_FLAG_NEED_CTX_IDX      (1 << 3)
+#define IGB_FLAG_RX_CSUM_DISABLED  (1 << 4)
 
 enum e1000_state_t {
        __IGB_TESTING,