summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/intel/e1000e/ethtool.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-07-21 08:30:28 +0400
committerDavid S. Miller <davem@davemloft.net>2014-07-21 08:30:28 +0400
commit1b31a1bf851b55ce3180b0e40998ee32a2cc61e0 (patch)
tree3e1f9170e5c2be9e637f3aa9696fff0a15403790 /drivers/net/ethernet/intel/e1000e/ethtool.c
parentfa4eff44a65c91c9ad09e5695ba171a107e5c327 (diff)
parentb684106a53c42f1cd089c09809d236036e2af5ad (diff)
downloadlinux-1b31a1bf851b55ce3180b0e40998ee32a2cc61e0.tar.xz
Merge branch 'break_after_return'
Fabian Frederick says: ==================== drivers/net: remove unnecessary break after return Second patchset after "remove unnecessary break after goto" addressing break redundancy on drivers/net branch (suggested by Joe Perches) ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/ethtool.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/ethtool.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index 815e26c6d34b..865ce45f9ec3 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -1521,11 +1521,9 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
switch (hw->mac.type) {
case e1000_80003es2lan:
return e1000_set_es2lan_mac_loopback(adapter);
- break;
case e1000_82571:
case e1000_82572:
return e1000_set_82571_fiber_loopback(adapter);
- break;
default:
rctl = er32(RCTL);
rctl |= E1000_RCTL_LBM_TCVR;