svn commit: r258280 - stable/10/sys/ofed/drivers/net/mlx4

[Alfred Perlstein]

Author: alfred
Date: Sun Nov 17 22:24:34 2013
New Revision: 258280
URL: http://svnweb.freebsd.org/changeset/base/258280

Log:
  MFC:  258276
  
  Fix creating a vlan over lagg over mlxen crash.
  
  PR:             181931
  Submitted by:   Shahar Klein (shahark mellanox.com)
  
  Approved by:	re

Modified:
  stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c
Directory Properties:
  stable/10/sys/   (props changed)

Modified: stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c
==============================================================================
--- stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c	Sun Nov 17 21:36:19 2013	(r258279)
+++ stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c	Sun Nov 17 22:24:34 2013	(r258280)
@@ -52,6 +52,9 @@ static void mlx4_en_vlan_rx_add_vid(void
 	int idx;
 	u8 field;
 
+	if (arg != priv)
+		return;
+
 	if ((vid == 0) || (vid > 4095))    /* Invalid */
 		return;
 	en_dbg(HW, priv, "adding VLAN:%d\n", vid);
@@ -73,6 +76,9 @@ static void mlx4_en_vlan_rx_kill_vid(voi
 	int idx;
 	u8 field;
 
+	if (arg != priv)
+		return;
+
 	if ((vid == 0) || (vid > 4095))    /* Invalid */
 		return;
 	en_dbg(HW, priv, "Killing VID:%d\n", vid);