From 86abc3638bbc18f6212794a4108c0abf563d794e Mon Sep 17 00:00:00 2001 From: "Akeem G. Abodunrin" Date: Wed, 20 Mar 2013 08:01:40 +0000 Subject: [PATCH] --- yaml --- r: 369726 b: refs/heads/master c: 0ba96d3d91882ae27083d8de8634ce0fae20dee6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7f61dc367c10..6aad90687045 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5700ff26f170864ea1cb0ceb00784e1838cfeeb5 +refs/heads/master: 0ba96d3d91882ae27083d8de8634ce0fae20dee6 diff --git a/trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c b/trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c index 48b594701efa..7876240fa74e 100644 --- a/trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -1678,17 +1678,12 @@ static int igb_setup_loopback_test(struct igb_adapter *adapter) wr32(E1000_CONNSW, reg); /* Unset sigdetect for SERDES loopback on - * 82580 and i350 devices. + * 82580 and newer devices. */ - switch (hw->mac.type) { - case e1000_82580: - case e1000_i350: + if (hw->mac.type >= e1000_82580) { reg = rd32(E1000_PCS_CFG0); reg |= E1000_PCS_CFG_IGN_SD; wr32(E1000_PCS_CFG0, reg); - break; - default: - break; } /* Set PCS register for forced speed */