Module Name: src
Committed By: msaitoh
Date: Tue Jun 3 14:57:09 UTC 2014
Modified Files:
src/sys/dev/pci [netbsd-6]: if_wm.c
Log Message:
Pull up following revision(s) (requested by tls in ticket #1070):
sys/dev/pci/if_wm.c: revision 1.269
>From dyoung@ -- bump max TX DMA size to avoid pathological condition with TSO.
To generate a diff of this commit:
cvs rdiff -u -r1.227.2.10 -r1.227.2.11 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.227.2.10 src/sys/dev/pci/if_wm.c:1.227.2.11
--- src/sys/dev/pci/if_wm.c:1.227.2.10 Mon Jul 29 20:24:04 2013
+++ src/sys/dev/pci/if_wm.c Tue Jun 3 14:57:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.227.2.10 2013/07/29 20:24:04 jdc Exp $ */
+/* $NetBSD: if_wm.c,v 1.227.2.11 2014/06/03 14:57:09 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.227.2.10 2013/07/29 20:24:04 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.227.2.11 2014/06/03 14:57:09 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -167,7 +167,7 @@ int wm_debug = WM_DEBUG_TX | WM_DEBUG_RX
#define WM_NEXTTX(sc, x) (((x) + 1) & WM_NTXDESC_MASK(sc))
#define WM_NEXTTXS(sc, x) (((x) + 1) & WM_TXQUEUELEN_MASK(sc))
-#define WM_MAXTXDMA round_page(IP_MAXPACKET) /* for TSO */
+#define WM_MAXTXDMA (2 * round_page(IP_MAXPACKET)) /* for TSO */
/*
* Receive descriptor list size. We have one Rx buffer for normal
