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

[~andy/linux] / drivers / net / igb / igb.h

diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h
index c25ca17d3228ef025799cd7cea73eabab9a7f6d3..4ff6f0567f3f1184382712b3ee0c4bf9ac0fd2e0 100644 (file)
--- a/drivers/net/igb/igb.h
+++ b/drivers/net/igb/igb.h
@@ -47,7 +47,9 @@ struct igb_adapter;
 
 #define IGB_MIN_DYN_ITR 3000
 #define IGB_MAX_DYN_ITR 96000
-#define IGB_START_ITR 6000
+
+/* ((1000000000ns / (6000ints/s * 1024ns)) << 2 = 648 */
+#define IGB_START_ITR 648
 
 #define IGB_DYN_ITR_PACKET_THRESHOLD 2
 #define IGB_DYN_ITR_LENGTH_LOW 200
@@ -170,9 +172,10 @@ struct igb_ring {
                };
                /* RX */
                struct {
-                       int no_itr_adjust;
                        struct igb_queue_stats rx_stats;
                        struct napi_struct napi;
+                       int set_itr;
+                       struct igb_ring *buddy;
 #ifdef CONFIG_IGB_LRO
                        struct net_lro_mgr lro_mgr;
                        bool lro_used;
@@ -219,7 +222,6 @@ struct igb_adapter {
        u32 itr_setting;
        u16 tx_itr;
        u16 rx_itr;
-       int set_itr;
 
        struct work_struct reset_task;
        struct work_struct watchdog_task;
@@ -285,9 +287,7 @@ struct igb_adapter {
        int bars;
        int need_ioport;
 
-#ifdef CONFIG_NETDEVICES_MULTIQUEUE
        struct igb_ring *multi_tx_table[IGB_MAX_TX_QUEUES];
-#endif /* CONFIG_NETDEVICES_MULTIQUEUE */
 #ifdef CONFIG_IGB_LRO
        unsigned int lro_max_aggr;
        unsigned int lro_aggregated;