svn commit: r336281 - head/sys/dev/vnic

[Mark Johnston]

Author: markj
Date: Sat Jul 14 16:06:53 2018
New Revision: 336281
URL: https://svnweb.freebsd.org/changeset/base/336281

Log:
  Fix vnic fallback PHY name matching after r334880.
  
  In some cases it seems that the PHY mode can only be identified by
  matching against the corresponding device node name in the FDT.  r334880
  broke this for the case where the node name contains a unit address.
  Fix the problem by allowing a match in that case.
  
  Reviewed by:	andrew, sbruno
  Tested by:	sbruno
  Differential Revision:	https://reviews.freebsd.org/D16259

Modified:
  head/sys/dev/vnic/thunder_bgx_fdt.c

Modified: head/sys/dev/vnic/thunder_bgx_fdt.c
==============================================================================
--- head/sys/dev/vnic/thunder_bgx_fdt.c	Sat Jul 14 15:45:11 2018	(r336280)
+++ head/sys/dev/vnic/thunder_bgx_fdt.c	Sat Jul 14 16:06:53 2018	(r336281)
@@ -193,7 +193,8 @@ bgx_fdt_phy_name_match(struct bgx *bgx, char *phy_name
 
 	if (sz > size)
 		return (FALSE);
-	if (strncmp(phy_name, type, sz) == 0)
+	if (strncmp(phy_name, type, sz - 1) == 0 &&
+	    (phy_name[sz - 1] == '\0' || phy_name[sz - 1] == '@'))
 		return (TRUE);
 
 	return (FALSE);