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;