Author: hselasky
Date: Thu May 16 16:30:25 2019
New Revision: 347769
URL: https://svnweb.freebsd.org/changeset/base/347769

Log:
  MFC r347304:
  Always return success for RoCE modify port in mlx5ib.
  
  CM layer calls ib_modify_port() regardless of the link layer.
  
  For the Ethernet ports, qkey violation and Port capabilities
  are meaningless. Therefore, always return success for ib_modify_port
  calls on the Ethernet ports.
  
  Linux Commit:
  ec2558796d25e6024071b6bcb8e11392538d57bf
  
  Submitted by: slavash@
  Sponsored by: Mellanox Technologies

Modified:
  stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c       Thu May 16 16:29:48 
2019        (r347768)
+++ stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c       Thu May 16 16:30:25 
2019        (r347769)
@@ -1078,6 +1078,14 @@ static int mlx5_ib_modify_port(struct ib_device *ibdev
        u32 tmp;
        int err;
 
+       /*
+        * CM layer calls ib_modify_port() regardless of the link
+        * layer. For Ethernet ports, qkey violation and Port
+        * capabilities are meaningless.
+        */
+       if (mlx5_ib_port_link_layer(ibdev, port) == IB_LINK_LAYER_ETHERNET)
+               return 0;
+
        mutex_lock(&dev->cap_mask_mutex);
 
        err = mlx5_ib_query_port(ibdev, port, &attr);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to