From 9135f01a4c830d4138af761f50544d78700831ff Mon Sep 17 00:00:00 2001 From: Fernando Luis Vazquez Cao Date: Mon, 17 Jun 2013 11:28:03 +0900 Subject: [PATCH] --- yaml --- r: 377400 b: refs/heads/master c: 788dfcacacfbdd51f9c92065bd8e136686f07a29 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/ethtool.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9838b4b09228..6ecb55b528c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab8e99d276d4b72d1532bda4423b14c9e2ce053c +refs/heads/master: 788dfcacacfbdd51f9c92065bd8e136686f07a29 diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c index 22efdaa76ebf..ce91766eeca9 100644 --- a/trunk/net/core/ethtool.c +++ b/trunk/net/core/ethtool.c @@ -60,10 +60,10 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] [NETIF_F_IPV6_CSUM_BIT] = "tx-checksum-ipv6", [NETIF_F_HIGHDMA_BIT] = "highdma", [NETIF_F_FRAGLIST_BIT] = "tx-scatter-gather-fraglist", - [NETIF_F_HW_VLAN_CTAG_TX_BIT] = "tx-vlan-ctag-hw-insert", + [NETIF_F_HW_VLAN_CTAG_TX_BIT] = "tx-vlan-hw-insert", - [NETIF_F_HW_VLAN_CTAG_RX_BIT] = "rx-vlan-ctag-hw-parse", - [NETIF_F_HW_VLAN_CTAG_FILTER_BIT] = "rx-vlan-ctag-filter", + [NETIF_F_HW_VLAN_CTAG_RX_BIT] = "rx-vlan-hw-parse", + [NETIF_F_HW_VLAN_CTAG_FILTER_BIT] = "rx-vlan-filter", [NETIF_F_HW_VLAN_STAG_TX_BIT] = "tx-vlan-stag-hw-insert", [NETIF_F_HW_VLAN_STAG_RX_BIT] = "rx-vlan-stag-hw-parse", [NETIF_F_HW_VLAN_STAG_FILTER_BIT] = "rx-vlan-stag-filter",