summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSasha Neftin <sasha.neftin@intel.com>2019-04-03 15:58:04 +0200
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2019-05-29 00:54:39 +0200
commitae586f0b39d508f400fdfa8139ebac96c72c1f86 (patch)
treee063a4020e8b759f52726c479071114016dfc417 /drivers
parentigb: mark expected switch fall-through (diff)
downloadlinux-ae586f0b39d508f400fdfa8139ebac96c72c1f86.tar.xz
linux-ae586f0b39d508f400fdfa8139ebac96c72c1f86.zip
igc: Fix double definitions
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/intel/igc/igc_defines.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h
index a9a30268de59..6f17ed3de995 100644
--- a/drivers/net/ethernet/intel/igc/igc_defines.h
+++ b/drivers/net/ethernet/intel/igc/igc_defines.h
@@ -264,9 +264,6 @@
#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