Commit b405e8df authored by David S. Miller's avatar David S. Miller
Browse files

e1000e: Fix namespace conflicts wrt. e1000_has_link 



Reported by Stephen Rothwell.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 570930fe

drivers/net/e1000e/e1000.h

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ extern int e1000e_setup_tx_resources(struct e1000_adapter *adapter); 
extern void e1000e_free_rx_resources(struct e1000_adapter *adapter);

extern void e1000e_free_tx_resources(struct e1000_adapter *adapter);

extern void e1000e_update_stats(struct e1000_adapter *adapter);

extern bool e1000_has_link(struct e1000_adapter *adapter);

extern bool e1000e_has_link(struct e1000_adapter *adapter);

extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter);

extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter);

drivers/net/e1000e/ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static u32 e1000_get_link(struct net_device *netdev) 
	if (!netif_carrier_ok(netdev))

		mac->get_link_status = 1;



	return e1000_has_link(adapter);

	return e1000e_has_link(adapter);

}



static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)

drivers/net/e1000e/netdev.c

+2 −2
Original line number Diff line number Diff line
@@ -3472,7 +3472,7 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) 
	       ((ctrl & E1000_CTRL_TFCE) ? "TX" : "None" )));

}



bool e1000_has_link(struct e1000_adapter *adapter)

bool e1000e_has_link(struct e1000_adapter *adapter)

{

	struct e1000_hw *hw = &adapter->hw;

	bool link_active = 0;
@@ -3553,7 +3553,7 @@ static void e1000_watchdog_task(struct work_struct *work) 
	u32 link, tctl;

	int tx_pending = 0;



	link = e1000_has_link(adapter);

	link = e1000e_has_link(adapter);

	if ((netif_carrier_ok(netdev)) && link) {

		e1000e_enable_receives(adapter);

		goto link_up;