 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wm.c,v 1.693 2020/10/30 06:23:39 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.694 2020/10/30 06:29:47 msaitoh Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -72,27 +72,27 @@
+ *
  * TODO (in order of importance):
+ *
  *	- Check XXX'ed comments
  *	- TX Multi queue improvement (refine queue selection logic)
  *	- Split header buffer for newer descriptors
  *	- EEE (Energy Efficiency Ethernet) for I354
  *	- Virtual Function
  *	- Set LED correctly (based on contents in EEPROM)
  *	- Rework how parameters are loaded from the EEPROM.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.693 2020/10/30 06:23:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.694 2020/10/30 06:29:47 msaitoh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #include "opt_if_wm.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 @@ -10257,29 +10257,32 @@ wm_gmii_setup_phytype(struct wm_softc *s
 			break;
 		case MII_OUI_INTEL:
 			switch (phy_model) {
 			case MII_MODEL_INTEL_I82577:
 				new_phytype = WMPHY_82577;
 				break;
 			case MII_MODEL_INTEL_I82579:
 				new_phytype = WMPHY_82579;
 				break;
 			case MII_MODEL_INTEL_I217:
 				new_phytype = WMPHY_I217;
 				break;
 			case MII_MODEL_INTEL_I82580:
 			case MII_MODEL_INTEL_I350:
 				new_phytype = WMPHY_82580;
 				break;
 			case MII_MODEL_INTEL_I350:
 				new_phytype = WMPHY_I350;
 				break;
 				break;
 			default:
 				break;
+			}
 			break;
 		case MII_OUI_yyINTEL:
 			switch (phy_model) {
 			case MII_MODEL_yyINTEL_I82562G:
 			case MII_MODEL_yyINTEL_I82562EM:
 			case MII_MODEL_yyINTEL_I82562ET:
 				new_phytype = WMPHY_IFE;
 				break;
 			case MII_MODEL_yyINTEL_IGP01E1000:
 				new_phytype = WMPHY_IGP;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wmvar.h,v 1.46 2020/09/15 08:39:04 msaitoh Exp $	*/
+/*	$NetBSD: if_wmvar.h,v 1.47 2020/10/30 06:29:47 msaitoh Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -188,28 +188,29 @@ typedef enum {
 typedef enum {
 	WMPHY_UNKNOWN = 0,
 	WMPHY_NONE,
 	WMPHY_M88,	/* 88E1000: 8254[34], E1011: 8254[056], E1111: 82573 */
 	WMPHY_IGP,	/* 8254[17] */
 	WMPHY_IGP_2,	/* 8257[12] */
 	WMPHY_GG82563,	/* 8256[34]: 80003 */
 	WMPHY_IGP_3,	/* 82566: 82575, 82576, ICH8, ICH9 */
 	WMPHY_IFE,	/* 82562: ICH8 ICH9 */
 	WMPHY_BM,	/* 82567: ICH8 ICH9 ICH10 */
 	WMPHY_82578,	/* 82578: PCH */
 	WMPHY_82577,	/* 82577: PCH (NOTE: functionality newer than 82578) */
-	WMPHY_82579,	/* 82579 : PCH2 */
+	WMPHY_82579,	/* 82579: PCH2 */
 	WMPHY_I217,	/* I217:  _LPT, I218: _LPT, I219: _SPT _CNP */
-	WMPHY_82580,	/* 82580: 82580 or I350 */
+	WMPHY_82580,	/* 82580 */
 	WMPHY_I350,	/* I350 */
 	WMPHY_VF,
 	WMPHY_I210	/* I210: I210 I211 */
 } wm_phy_type;
 #define WM_GEN_POLL_TIMEOUT	640
 #define WM_PHY_CFG_TIMEOUT	100
 #define	WM_ICH8_LAN_INIT_TIMEOUT 1500
 #define	WM_MDIO_OWNERSHIP_TIMEOUT 10
 #define	WM_MAX_PLL_TRIES	5
 #endif /* _DEV_PCI_IF_WMVAR_H_ */