Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small fixes from knakahara: 

- Check return value correctly in wm_lv_jumbo_workaround_ich8lan().
- Fix comment.
This commit is contained in:
msaitoh 2020-09-24 08:00:59 +00:00
parent 1848d6d425
commit 5673b8ef88
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/pci/if_wm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wm.c,v 1.689 2020/09/16 15:04:57 msaitoh Exp $ */ /* $NetBSD: if_wm.c,v 1.690 2020/09/24 08:00:59 msaitoh Exp $ */
/* /*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@ -82,7 +82,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.689 2020/09/16 15:04:57 msaitoh Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.690 2020/09/24 08:00:59 msaitoh Exp $");
#ifdef _KERNEL_OPT #ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h" #include "opt_net_mpsafe.h"
@ -9074,7 +9074,7 @@ wm_rxeof(struct wm_rxqueue *rxq, u_int limit)
/* /*
* Okay, we have the entire packet now. The chip is * Okay, we have the entire packet now. The chip is
* configured to include the FCS except I35[05], I21[01]. * configured to include the FCS except I35[04], I21[01].
* (not all chips can be configured to strip it), so we need * (not all chips can be configured to strip it), so we need
* to trim it. Those chips have an eratta, the RCTL_SECRC bit * to trim it. Those chips have an eratta, the RCTL_SECRC bit
* in RCTL register is always set, so we don't trim it. * in RCTL register is always set, so we don't trim it.
@ -15969,7 +15969,7 @@ wm_lv_jumbo_workaround_ich8lan(struct wm_softc *sc, bool enable)
return rv; return rv;
/* Disable Rx path while enabling/disabling workaround */ /* Disable Rx path while enabling/disabling workaround */
sc->phy.readreg_locked(dev, 2, I82579_DFT_CTRL, &dft_ctrl); rv = sc->phy.readreg_locked(dev, 2, I82579_DFT_CTRL, &dft_ctrl);
if (rv != 0) if (rv != 0)
goto out; goto out;
rv = sc->phy.writereg_locked(dev, 2, I82579_DFT_CTRL, rv = sc->phy.writereg_locked(dev, 2, I82579_DFT_CTRL,