]> git.baikalelectronics.ru Git - kernel.git/commitdiff
igc: Fix double definition
authorSasha Neftin <sasha.neftin@intel.com>
Fri, 28 Feb 2020 17:50:07 +0000 (19:50 +0200)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 17 Apr 2020 17:19:24 +0000 (10:19 -0700)
IGC_START_ITR has beed defined twice
This patch come to fix it

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/igc/igc.h

index c7b0afd370d4b08a36b048dd44183aa97c36af96..4643f358b8432ee8224e78f09852477aa2849b93 100644 (file)
@@ -246,9 +246,6 @@ extern char igc_driver_version[];
 /* flags controlling PTP/1588 function */
 #define IGC_PTP_ENABLED                BIT(0)
 
-/* Interrupt defines */
-#define IGC_START_ITR                  648 /* ~6000 ints/sec */
-
 /* Flags definitions */
 #define IGC_FLAG_HAS_MSI               BIT(0)
 #define IGC_FLAG_QUEUE_PAIRS           BIT(3)
@@ -270,6 +267,7 @@ extern char igc_driver_version[];
 #define IGC_MRQC_RSS_FIELD_IPV4_UDP    0x00400000
 #define IGC_MRQC_RSS_FIELD_IPV6_UDP    0x00800000
 
+/* Interrupt defines */
 #define IGC_START_ITR                  648 /* ~6000 ints/sec */
 #define IGC_4K_ITR                     980
 #define IGC_20K_ITR                    196