]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
igc: Fix double definitions
authorSasha Neftin <sasha.neftin@intel.com>
Wed, 3 Apr 2019 13:58:04 +0000 (16:58 +0300)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 28 May 2019 22:54:39 +0000 (15:54 -0700)
Collision threshold and threshold's shift has been defined twice.
This patch comes to fix that.

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_defines.h

index a9a30268de59d2b986617f06fc5840ed82ec299c..6f17ed3de9955b075b7ec0676c3d98f14a821e7f 100644 (file)
 #define IGC_TCTL_RTLC          0x01000000 /* Re-transmit on late collision */
 #define IGC_TCTL_MULR          0x10000000 /* Multiple request support */
 
-#define IGC_CT_SHIFT                   4
-#define IGC_COLLISION_THRESHOLD                15
-
 /* Flow Control Constants */
 #define FLOW_CONTROL_ADDRESS_LOW       0x00C28001
 #define FLOW_CONTROL_ADDRESS_HIGH      0x00000100