Commit 89d351c0 authored Aug 01, 2012 by Jesper Juhl Committed by Peter P Waskiewicz Jr Aug 04, 2012

igb: correct hardware type (i210/i211) check in igb_loopback_test()



In the original code
...
 	if ((adapter->hw.mac.type == e1000_i210)
		|| (adapter->hw.mac.type == e1000_i210)) {
...
the second check of 'adapter->hw.mac.type' is pointless since it tests
for the exact same value as the first.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>

parent 925b11f7

drivers/net/ethernet/intel/igb/igb_ethtool.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1783,7 +1783,7 @@ static int igb_loopback_test(struct igb_adapter adapter, u64 data)
		goto out;
		}
		if ((adapter->hw.mac.type == e1000_i210)
		\|\| (adapter->hw.mac.type == e1000_i210)) {
		\|\| (adapter->hw.mac.type == e1000_i211)) {
		dev_err(&adapter->pdev->dev,
		"Loopback test not supported "
		"on this part at this time.\n");