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/ethtool.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/ethtool.c')
-rw-r--r-- | drivers/net/e1000e/ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c index 0aa50c229c79..b33e3cbe9ab0 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c | |||
@@ -202,7 +202,7 @@ static u32 e1000_get_link(struct net_device *netdev) | |||
202 | if (!netif_carrier_ok(netdev)) | 202 | if (!netif_carrier_ok(netdev)) |
203 | mac->get_link_status = 1; | 203 | mac->get_link_status = 1; |
204 | 204 | ||
205 | return e1000_has_link(adapter); | 205 | return e1000e_has_link(adapter); |
206 | } | 206 | } |
207 | 207 | ||
208 | static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx) | 208 | static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx) |