From 6532fb7e2d8ff6467397d4e7a64726ffc1865008 Mon Sep 17 00:00:00 2001
From: Hadar Hen Zion <hadarh@mellanox.com>
Date: Wed, 30 Jan 2013 23:07:05 +0000
Subject: [PATCH] --- yaml --- r: 352023 b: refs/heads/master c:
 69d7126b7fef09beaa4b7c103ec2a5bd8c8b2666 h: refs/heads/master i:   352021:
 107574c907df187e9fec4829565462d34510f901   352019:
 ab90bd96cab441449a756d50cdd786dba5abea7f   352015:
 0be083132c9e401785179a15b7156df06845b1a4 v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 68efdcc1f0d3..fb193131f9d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f90a36734a6a0d843baa37b7caa1ef020f799d47
+refs/heads/master: 69d7126b7fef09beaa4b7c103ec2a5bd8c8b2666
diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index 86afb5b0e0fa..f33049f9bfe7 100644
--- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -669,6 +669,10 @@ static int mlx4_en_validate_flow(struct net_device *dev,
 		    !(cmd->fs.m_ext.vlan_tci == 0 ||
 		      cmd->fs.m_ext.vlan_tci == cpu_to_be16(0xfff)))
 			return -EINVAL;
+		if (cmd->fs.m_ext.vlan_tci) {
+			if (be16_to_cpu(cmd->fs.h_ext.vlan_tci) >= VLAN_N_VID)
+				return -EINVAL;
+		}
 	}
 
 	return 0;