diff options
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/82571.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/ethtool.c | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/ich8lan.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/phy.c | 1 | 
5 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c index 1db7e3df43e..2faffbde179 100644 --- a/drivers/net/ethernet/intel/e1000e/82571.c +++ b/drivers/net/ethernet/intel/e1000e/82571.c @@ -1534,7 +1534,6 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)  	rxcw = er32(RXCW);  	if ((rxcw & E1000_RXCW_SYNCH) && !(rxcw & E1000_RXCW_IV)) { -  		/* Receiver is synchronized with no invalid bits.  */  		switch (mac->serdes_link_state) {  		case e1000_serdes_link_autoneg_complete: diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c index 455e385120b..2c1813737f6 100644 --- a/drivers/net/ethernet/intel/e1000e/ethtool.c +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c @@ -130,7 +130,6 @@ static int e1000_get_settings(struct net_device *netdev,  	u32 speed;  	if (hw->phy.media_type == e1000_media_type_copper) { -  		ecmd->supported = (SUPPORTED_10baseT_Half |  				   SUPPORTED_10baseT_Full |  				   SUPPORTED_100baseT_Half | @@ -328,12 +327,12 @@ static int e1000_set_settings(struct net_device *netdev,  	}  	/* reset the link */ -  	if (netif_running(adapter->netdev)) {  		e1000e_down(adapter);  		e1000e_up(adapter); -	} else +	} else {  		e1000e_reset(adapter); +	}  	clear_bit(__E1000_RESETTING, &adapter->state);  	return 0; diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index 1e838b235e8..dff7bff8b8e 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -3991,7 +3991,6 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)  		 * The SMBus release must also be disabled on LCD reset.  		 */  		if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) { -  			/* Enable proxy to reset only on power good. */  			e1e_rphy_locked(hw, I217_PROXY_CTRL, &phy_reg);  			phy_reg |= I217_PROXY_CTRL_AUTO_DISABLE; diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 382b031e7b2..3f7dbd1cdb0 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -87,7 +87,6 @@ struct e1000_reg_info {  };  static const struct e1000_reg_info e1000_reg_info_tbl[] = { -  	/* General Registers */  	{E1000_CTRL, "CTRL"},  	{E1000_STATUS, "STATUS"}, @@ -6394,7 +6393,6 @@ static void e1000_io_resume(struct pci_dev *pdev)  	 */  	if (!(adapter->flags & FLAG_HAS_AMT))  		e1000e_get_hw_control(adapter); -  }  static void e1000_print_device_info(struct e1000_adapter *adapter) diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c index a5ff13b9ef8..0930c136aa3 100644 --- a/drivers/net/ethernet/intel/e1000e/phy.c +++ b/drivers/net/ethernet/intel/e1000e/phy.c @@ -2474,7 +2474,6 @@ s32 e1000e_read_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 *data)  	hw->phy.addr = 1;  	if (offset > MAX_PHY_MULTI_PAGE_REG) { -  		/* Page is shifted left, PHY expects (page x 32) */  		ret_val = e1000e_write_phy_reg_mdic(hw, BM_PHY_PAGE_SELECT,  						    page);  |