Module Name: src Committed By: msaitoh Date: Fri Oct 30 06:29:47 UTC 2020
Modified Files: src/sys/dev/pci: if_wm.c if_wmvar.h Log Message: Add WMPHY_I350. Not used yet. To generate a diff of this commit: cvs rdiff -u -r1.693 -r1.694 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/if_wmvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.693 src/sys/dev/pci/if_wm.c:1.694 --- src/sys/dev/pci/if_wm.c:1.693 Fri Oct 30 06:23:39 2020 +++ src/sys/dev/pci/if_wm.c Fri Oct 30 06:29:47 2020 @@ -1,4 +1,4 @@ -/* $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. @@ -82,7 +82,7 @@ */ #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" @@ -10267,9 +10267,12 @@ wm_gmii_setup_phytype(struct wm_softc *s 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; } Index: src/sys/dev/pci/if_wmvar.h diff -u src/sys/dev/pci/if_wmvar.h:1.46 src/sys/dev/pci/if_wmvar.h:1.47 --- src/sys/dev/pci/if_wmvar.h:1.46 Tue Sep 15 08:39:04 2020 +++ src/sys/dev/pci/if_wmvar.h Fri Oct 30 06:29:47 2020 @@ -1,4 +1,4 @@ -/* $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. @@ -198,9 +198,10 @@ typedef enum { 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;