diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-07-04 00:20:23 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-07-04 00:20:23 +0000 |
| commit | b6abc47c44da90c5f29ca01205dbbfecb2f8837c (patch) | |
| tree | ee32b21f717d4febf6d6c4be1519f2b06b587bc0 | |
| parent | 07999298d834239e1eb0faed58b2061ef4c010fe (diff) | |
Revert r1.42 of if_bnx.c, "Enable IPv4 transmit TCP/UDP checksum
offload", and associated man page change. To use IPv4 transmit TCP/UDP
checksum offloading you must again define BNX_CSUM.
As requested by mbalmer@ via deraadt@ on suggestion of reyk@ in
response to PR #5437.
| -rw-r--r-- | share/man/man4/bnx.4 | 5 | ||||
| -rw-r--r-- | sys/dev/pci/if_bnx.c | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/share/man/man4/bnx.4 b/share/man/man4/bnx.4 index fb4ce99dbe9..8c0920b6963 100644 --- a/share/man/man4/bnx.4 +++ b/share/man/man4/bnx.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bnx.4,v 1.16 2007/05/31 19:19:49 jmc Exp $ +.\" $OpenBSD: bnx.4,v 1.17 2007/07/04 00:20:22 krw Exp $ .\" .\"Copyright (c) 2006 Broadcom Corporation .\" David Christensen <davidch@broadcom.com>. All rights reserved. @@ -30,7 +30,7 @@ \" .\" $FreeBSD: /repoman/r/ncvs/src/share/man/man4/bce.4,v 1.2 2006/04/10 20:12:17 brueffer Exp $ .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: July 4 2007 $ .Dt BNX 4 .Os .Sh NAME @@ -77,7 +77,6 @@ The following features are supported in the driver under .Ox : .Bd -literal -offset indent -IPv4 transmit TCP/UDP checksum offload IPv4 receive IP/TCP/UDP checksum offload .\"Jumbo frames (up to 9022 bytes) VLAN tag insertion diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c index 4550b021718..cbb1408448e 100644 --- a/sys/dev/pci/if_bnx.c +++ b/sys/dev/pci/if_bnx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnx.c,v 1.52 2007/05/22 22:08:57 reyk Exp $ */ +/* $OpenBSD: if_bnx.c,v 1.53 2007/07/04 00:20:22 krw Exp $ */ /*- * Copyright (c) 2006 Broadcom Corporation @@ -876,8 +876,11 @@ bnx_attachhook(void *xsc) bcopy(sc->eaddr, sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); bcopy(sc->bnx_dev.dv_xname, ifp->if_xname, IFNAMSIZ); - ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_CSUM_TCPv4 | - IFCAP_CSUM_UDPv4; + ifp->if_capabilities = IFCAP_VLAN_MTU; + +#ifdef BNX_CSUM + ifp->if_capabilities |= IFCAP_CSUM_TCPv4 | IFCAP_CSUM_UDPv4; +#endif #if NVLAN > 0 ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING; |