Module Name: src
Committed By: msaitoh
Date: Thu Sep 24 08:00:59 UTC 2020
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Small fixes from knakahara:
- Check return value correctly in wm_lv_jumbo_workaround_ich8lan().
- Fix comment.
To generate a diff of this commit:
cvs rdiff -u -r1.689 -r1.690 src/sys/dev/pci/if_wm.c
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.689 src/sys/dev/pci/if_wm.c:1.690
--- src/sys/dev/pci/if_wm.c:1.689 Wed Sep 16 15:04:57 2020
+++ src/sys/dev/pci/if_wm.c Thu Sep 24 08:00:59 2020
@@ -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.
@@ -82,7 +82,7 @@
*/
#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
#include "opt_net_mpsafe.h"
@@ -9074,7 +9074,7 @@ wm_rxeof(struct wm_rxqueue *rxq, u_int l
/*
* 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
* to trim it. Those chips have an eratta, the RCTL_SECRC bit
* in RCTL register is always set, so we don't trim it.
@@ -15969,7 +15969,7 @@ wm_lv_jumbo_workaround_ich8lan(struct wm
return rv;
/* 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)
goto out;
rv = sc->phy.writereg_locked(dev, 2, I82579_DFT_CTRL,
