---

yaml --- r: 369339 b: refs/heads/master c: 2d6577f h: refs/heads/master i: 369337: 7892781 369335: 7e1540a v: v3
git-mirror · Apr 19, 2013 · 8e7afff · 8e7afff
1 parent 66534dc
commit 8e7afff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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",