Module Name: src
Committed By: knakahara
Date: Mon Jan 29 04:17:32 UTC 2018
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix unmatched return type. The return value of wm_txeof() is not useded yet.
To generate a diff of this commit:
cvs rdiff -u -r1.560 -r1.561 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.560 src/sys/dev/pci/if_wm.c:1.561
--- src/sys/dev/pci/if_wm.c:1.560 Mon Jan 29 03:42:30 2018
+++ src/sys/dev/pci/if_wm.c Mon Jan 29 04:17:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.560 2018/01/29 03:42:30 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.561 2018/01/29 04:17:32 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.560 2018/01/29 03:42:30 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.561 2018/01/29 04:17:32 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -8044,7 +8044,6 @@ wm_txeof(struct wm_txqueue *txq, u_int l
struct wm_softc *sc = txq->txq_sc;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
struct wm_txsoft *txs;
- bool processed = false;
int count = 0;
int i;
uint8_t status;
@@ -8085,7 +8084,6 @@ wm_txeof(struct wm_txqueue *txq, u_int l
break;
}
- processed = true;
count++;
DPRINTF(WM_DEBUG_TX,
("%s: TX: job %d done: descs %d..%d\n",
@@ -8142,7 +8140,7 @@ wm_txeof(struct wm_txqueue *txq, u_int l
if (txq->txq_sfree == WM_TXQUEUELEN(txq))
ifp->if_timer = 0;
- return processed;
+ return count;
}
static inline uint32_t
