From 8e7afff858804f3087b5a0bd20bd16eb0c4b6507 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 19 Apr 2013 16:08:23 -0400 Subject: [PATCH] --- yaml --- r: 369339 b: refs/heads/master c: 2d6577f17bd2ad02029872551dc97e84e19422a7 h: refs/heads/master i: 369337: 7892781079cde7697caf61726e7a2834823993e7 369335: 7e1540aef0d605243ad904ab2f443e5c45d47bc2 v: v3 --- [refs] | 2 +- trunk/net/core/ethtool.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4fcfc472531d..2a6b612ac07a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92352df1dbc5fa2dacfa3b16d57b4641d26be880 +refs/heads/master: 2d6577f17bd2ad02029872551dc97e84e19422a7 diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c index b87712cfd26c..5a934ef90f8b 100644 --- a/trunk/net/core/ethtool.c +++ b/trunk/net/core/ethtool.c @@ -64,6 +64,9 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] [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_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", [NETIF_F_VLAN_CHALLENGED_BIT] = "vlan-challenged", [NETIF_F_GSO_BIT] = "tx-generic-segmentation", [NETIF_F_LLTX_BIT] = "tx-lockless",