diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-05 01:31:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-05 01:31:41 -0500 |
commit | b405e8df26dfe4c56ab3f88f5cc1dfab0d220289 (patch) | |
tree | b6a1edf4f519536ad22c69a7d342038315859264 /drivers/net/e1000e/netdev.c | |
parent | 570930fe1ee497de6aafd895dbe80116cb10525f (diff) |
e1000e: Fix namespace conflicts wrt. e1000_has_link
Reported by Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 14a80f8f6118..ffa37c682a00 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -3472,7 +3472,7 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) | |||
3472 | ((ctrl & E1000_CTRL_TFCE) ? "TX" : "None" ))); | 3472 | ((ctrl & E1000_CTRL_TFCE) ? "TX" : "None" ))); |
3473 | } | 3473 | } |
3474 | 3474 | ||
3475 | bool e1000_has_link(struct e1000_adapter *adapter) | 3475 | bool e1000e_has_link(struct e1000_adapter *adapter) |
3476 | { | 3476 | { |
3477 | struct e1000_hw *hw = &adapter->hw; | 3477 | struct e1000_hw *hw = &adapter->hw; |
3478 | bool link_active = 0; | 3478 | bool link_active = 0; |
@@ -3553,7 +3553,7 @@ static void e1000_watchdog_task(struct work_struct *work) | |||
3553 | u32 link, tctl; | 3553 | u32 link, tctl; |
3554 | int tx_pending = 0; | 3554 | int tx_pending = 0; |
3555 | 3555 | ||
3556 | link = e1000_has_link(adapter); | 3556 | link = e1000e_has_link(adapter); |
3557 | if ((netif_carrier_ok(netdev)) && link) { | 3557 | if ((netif_carrier_ok(netdev)) && link) { |
3558 | e1000e_enable_receives(adapter); | 3558 | e1000e_enable_receives(adapter); |
3559 | goto link_up; | 3559 | goto link_up; |