diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-17 17:33:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-17 17:33:11 -0400 |
| commit | 9cbc94eabb0791906051bbfac024ef2c2be8e079 (patch) | |
| tree | 41ba194e687c6c60f5c883f98737ac83257d0c00 /net/core/ethtool.c | |
| parent | 1d1652cbdb9885e4d73972263e4cdbe1b0beebfe (diff) | |
| parent | 7cc31a9ae1477abc79d5992b3afe889f25c50c99 (diff) | |
| download | op-kernel-dev-9cbc94eabb0791906051bbfac024ef2c2be8e079.zip op-kernel-dev-9cbc94eabb0791906051bbfac024ef2c2be8e079.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/vmxnet3/vmxnet3_ethtool.c
net/core/dev.c
Diffstat (limited to 'net/core/ethtool.c')
| -rw-r--r-- | net/core/ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index b8c2bcf..84e7304 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -332,7 +332,7 @@ static const char netdev_features_strings[ETHTOOL_DEV_FEATURE_WORDS * 32][ETH_GS /* NETIF_F_IP_CSUM */ "tx-checksum-ipv4", /* NETIF_F_NO_CSUM */ "tx-checksum-unneeded", /* NETIF_F_HW_CSUM */ "tx-checksum-ip-generic", - /* NETIF_F_IPV6_CSUM */ "tx_checksum-ipv6", + /* NETIF_F_IPV6_CSUM */ "tx-checksum-ipv6", /* NETIF_F_HIGHDMA */ "highdma", /* NETIF_F_FRAGLIST */ "tx-scatter-gather-fraglist", /* NETIF_F_HW_VLAN_TX */ "tx-vlan-hw-insert", |
