Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Small fixes from knakahara:



details:   https://anonhg.NetBSD.org/src/rev/a87801e7dbc2
branches:  trunk
changeset: 955228:a87801e7dbc2
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Sep 24 08:00:59 2020 +0000

description:
Small fixes from knakahara:

- Check return value correctly in wm_lv_jumbo_workaround_ich8lan().
- Fix comment.

diffstat:

 sys/dev/pci/if_wm.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 1966105c2ac3 -r a87801e7dbc2 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Thu Sep 24 07:59:33 2020 +0000
+++ b/sys/dev/pci/if_wm.c       Thu Sep 24 08:00:59 2020 +0000
@@ -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 @@
 
                /*
                 * 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 @@
                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,



Home | Main Index | Thread Index | Old Index