[src/netbsd-6-0]: src/sys/dev/pci Pull up following revision(s) (requested by...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0340288cf689
branches:  netbsd-6-0
changeset: 774946:0340288cf689
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Jun 03 15:06:09 2014 +0000

description:
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.

diffstat:

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

diffs (27 lines):

diff -r 0f92c3d1d94f -r 0340288cf689 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Wed May 21 21:23:38 2014 +0000
+++ b/sys/dev/pci/if_wm.c       Tue Jun 03 15:06:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.227.2.3 2012/09/03 19:09:41 riz Exp $      */
+/*     $NetBSD: if_wm.c,v 1.227.2.3.2.1 2014/06/03 15:06: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.3 2012/09/03 19:09:41 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.227.2.3.2.1 2014/06/03 15:06:09 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -166,7 +166,7 @@
 #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