diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-05 06:31:41 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-05 06:31:41 (GMT) |
| commit | b405e8df26dfe4c56ab3f88f5cc1dfab0d220289 (patch) | |
| tree | b6a1edf4f519536ad22c69a7d342038315859264 /drivers/net/e1000e/ethtool.c | |
| parent | 570930fe1ee497de6aafd895dbe80116cb10525f (diff) | |
| download | linux-b405e8df26dfe4c56ab3f88f5cc1dfab0d220289.tar.xz | |
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 0aa50c2..b33e3cb 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) 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) |