From 66f0c02c1a10f55e9d8c3c9161b56aae7d82afdb Mon Sep 17 00:00:00 2001
From: Jesse Gross <jesse@nicira.com>
Date: Wed, 20 Oct 2010 13:56:07 +0000
Subject: [PATCH] --- yaml --- r: 215387 b: refs/heads/master c:
 d5dbda23804156ae6f35025ade5307a49d1db6d7 h: refs/heads/master i:   215385:
 821ad411d6fc666ea998f1f32a558a3481ae165d   215383:
 d52f034afdec1ef8f7e09aa79d1fd4c9fb9fba81 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/ethtool.h | 2 ++
 trunk/net/core/ethtool.c      | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9db2a52854e4..fa13a3b4ec1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3701e51382a026cba10c60b03efabe534fba4ca4
+refs/heads/master: d5dbda23804156ae6f35025ade5307a49d1db6d7
diff --git a/trunk/include/linux/ethtool.h b/trunk/include/linux/ethtool.h
index 8a3338ceb438..6628a507fd3b 100644
--- a/trunk/include/linux/ethtool.h
+++ b/trunk/include/linux/ethtool.h
@@ -309,6 +309,8 @@ struct ethtool_perm_addr {
  * flag differs from the read-only value.
  */
 enum ethtool_flags {
+	ETH_FLAG_TXVLAN		= (1 << 7),	/* TX VLAN offload enabled */
+	ETH_FLAG_RXVLAN		= (1 << 8),	/* RX VLAN offload enabled */
 	ETH_FLAG_LRO		= (1 << 15),	/* LRO is enabled */
 	ETH_FLAG_NTUPLE		= (1 << 27),	/* N-tuple filters enabled */
 	ETH_FLAG_RXHASH		= (1 << 28),
diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c
index 685c7005e87f..956a9f4971cb 100644
--- a/trunk/net/core/ethtool.c
+++ b/trunk/net/core/ethtool.c
@@ -132,7 +132,8 @@ EXPORT_SYMBOL(ethtool_op_set_ufo);
  * NETIF_F_xxx values in include/linux/netdevice.h
  */
 static const u32 flags_dup_features =
-	(ETH_FLAG_LRO | ETH_FLAG_NTUPLE | ETH_FLAG_RXHASH);
+	(ETH_FLAG_LRO | ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN | ETH_FLAG_NTUPLE |
+	 ETH_FLAG_RXHASH);
 
 u32 ethtool_op_get_flags(struct net_device *dev)
 {