diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-03 21:41:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-03 21:41:05 +0200 |
| commit | c1a13ff57ab1ce52a0aae9984594dbfcfbaf68c0 (patch) | |
| tree | c9f99adf0c1940ab0daeb2c3287152e49b096679 /drivers/net/myri10ge/myri10ge.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| parent | NET: add MAINTAINERS entry for ucc_geth driver (diff) | |
| download | linux-c1a13ff57ab1ce52a0aae9984594dbfcfbaf68c0.tar.xz linux-c1a13ff57ab1ce52a0aae9984594dbfcfbaf68c0.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
NET: add MAINTAINERS entry for ucc_geth driver
myri10ge: report link up/down in standard ethtool way
NetXen: Removal of extra free_irq call
Update tulip maintainer email address
smc91x: sh solution engine fixes.
e1000: disable polling before registering netdevice
network drivers: eliminate unneeded kill_vid code
atl1: eliminate unneeded kill_vid code
8139cp: fix VLAN unregistration
sky2: Fix VLAN unregistration
VLAN: kill_vid is only useful for VLAN filtering devices
qla3xxx: device doesnt do hardware checksumming.
Diffstat (limited to 'drivers/net/myri10ge/myri10ge.c')
| -rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 5d14be7405a3..b53b7ad999bc 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c @@ -1472,6 +1472,7 @@ static const struct ethtool_ops myri10ge_ethtool_ops = { .set_sg = ethtool_op_set_sg, .get_tso = ethtool_op_get_tso, .set_tso = ethtool_op_set_tso, + .get_link = ethtool_op_get_link, .get_strings = myri10ge_get_strings, .get_stats_count = myri10ge_get_stats_count, .get_ethtool_stats = myri10ge_get_ethtool_stats, |