Message ID | 20110517204015.2F4C013A6A@rere.qmqm.pl |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Michał Mirosław <mirq-linux@rere.qmqm.pl> Date: Tue, 17 May 2011 22:40:15 +0200 (CEST) > Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index ed6c0d4..59255c1 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -355,7 +355,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",
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> --- This is against net-next but shoud go also to net. net/core/ethtool.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)