svn commit: r319972 - head/sys/dev/mlx4/mlx4_en

[Hans Petter Selasky]

Author: hselasky
Date: Thu Jun 15 11:56:40 2017
New Revision: 319972
URL: https://svnweb.freebsd.org/changeset/base/319972

Log:
  Use static device numbering instead of dynamic one when creating
  mlx4en network interfaces. This prevents infinite unit number growth
  typically when the mlx4en driver is used inside virtual machines which
  support runtime PCI attach and detach.
  
  MFC after:	3 days
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c

Modified: head/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c
==============================================================================
--- head/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c	Thu Jun 15 07:15:05 2017	(r319971)
+++ head/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c	Thu Jun 15 11:56:40 2017	(r319972)
@@ -54,7 +54,6 @@
 
 static void mlx4_en_sysctl_stat(struct mlx4_en_priv *priv);
 static void mlx4_en_sysctl_conf(struct mlx4_en_priv *priv);
-static int mlx4_en_unit;
 
 #ifdef CONFIG_NET_RX_BUSY_POLL
 /* must be called with local_bh_disable()d */
@@ -2052,7 +2051,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int 
 		return -ENOMEM;
 	}
 	dev->if_softc = priv;
-	if_initname(dev, "mlxen", atomic_fetchadd_int(&mlx4_en_unit, 1));
+	if_initname(dev, "mlxen", (device_get_unit(
+	    mdev->pdev->dev.bsddev) * MLX4_MAX_PORTS) + port - 1);
 	dev->if_mtu = ETHERMTU;
 	dev->if_init = mlx4_en_open;
 	dev->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;