Module Name: src
Committed By: sborrill
Date: Wed Jun 13 15:55:03 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-4]: if_bge.c
Log Message:
Pull up the following revisions(s) (requested by buhrow in ticket #1449):
sys/dev/pci/if_bge.c: 1.194 via patch
Instruct hardware to perform checksumming over the entire packet not just
over the payload and notify upper layers appropriately. Fixes PR kern/40018.
To generate a diff of this commit:
cvs rdiff -u -r1.122.2.11 -r1.122.2.12 src/sys/dev/pci/if_bge.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_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.122.2.11 src/sys/dev/pci/if_bge.c:1.122.2.12
--- src/sys/dev/pci/if_bge.c:1.122.2.11 Tue Aug 18 10:10:19 2009
+++ src/sys/dev/pci/if_bge.c Wed Jun 13 15:55:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.122.2.11 2009/08/18 10:10:19 bouyer Exp $ */
+/* $NetBSD: if_bge.c,v 1.122.2.12 2012/06/13 15:55:03 sborrill Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.122.2.11 2009/08/18 10:10:19 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.122.2.12 2012/06/13 15:55:03 sborrill Exp $");
#include "bpfilter.h"
#include "vlan.h"
@@ -1638,7 +1638,7 @@ bge_chipinit(struct bge_softc *sc)
*/
CSR_WRITE_4(sc, BGE_MODE_CTL, BGE_DMA_SWAP_OPTIONS |
BGE_MODECTL_MAC_ATTN_INTR | BGE_MODECTL_HOST_SEND_BDS |
- BGE_MODECTL_TX_NO_PHDR_CSUM | BGE_MODECTL_RX_NO_PHDR_CSUM);
+ BGE_MODECTL_TX_NO_PHDR_CSUM);
/*
* Disable memory write invalidate. Apparently it is not supported
@@ -3029,7 +3029,7 @@ bge_rxeof(struct bge_softc *sc)
cur_rx->bge_tcp_udp_csum;
m->m_pkthdr.csum_flags |=
(M_CSUM_TCPv4|M_CSUM_UDPv4|
- M_CSUM_DATA|M_CSUM_NO_PSEUDOHDR);
+ M_CSUM_DATA);
}
/*
