svn commit: r368215 - stable/12/sys/dev/mlx4/mlx4_ib

[Hans Petter Selasky]

Author: hselasky
Date: Tue Dec  1 12:41:25 2020
New Revision: 368215
URL: https://svnweb.freebsd.org/changeset/base/368215

Log:
  MFC r367555:
  Include GID type when deleting GIDs from HW table under RoCE in mlx4ib.
  Refer to the Linux commit mentioned below for a more detailed description.
  
  Linux commit:
  a18177925c252da7801149abe217c05b80884798
  
  Requested by:	Isilon
  Sponsored by:	Mellanox Technologies // NVIDIA Networking

Modified:
  stable/12/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
==============================================================================
--- stable/12/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c	Tue Dec  1 12:39:16 2020	(r368214)
+++ stable/12/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c	Tue Dec  1 12:41:25 2020	(r368215)
@@ -371,8 +371,13 @@ static int mlx4_ib_del_gid(struct ib_device *device,
 		if (!gids) {
 			ret = -ENOMEM;
 		} else {
-			for (i = 0; i < MLX4_MAX_PORT_GIDS; i++)
-				memcpy(&gids[i].gid, &port_gid_table->gids[i].gid, sizeof(union ib_gid));
+			for (i = 0; i < MLX4_MAX_PORT_GIDS; i++) {
+				memcpy(&gids[i].gid,
+				       &port_gid_table->gids[i].gid,
+				       sizeof(union ib_gid));
+				gids[i].gid_type =
+				    port_gid_table->gids[i].gid_type;
+			}
 		}
 	}
 	spin_unlock_bh(&iboe->lock);