diff options
| author |   naddy <naddy@openbsd.org> | 2009-06-05 06:05:06 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2009-06-05 06:05:06 +0000 |
| commit | 00b4db88138cc003b3866cd3510ff30c66ad21cf (patch) | |
| tree | 94a8d2e146cee862343b8c82e9e6d4b3463168cc | |
| parent | add some hostname sanity check (diff) | |
| download | wireguard-openbsd-00b4db88138cc003b3866cd3510ff30c66ad21cf.tar.xz wireguard-openbsd-00b4db88138cc003b3866cd3510ff30c66ad21cf.zip | |
enable IPv6 receive TCP/UDP checksum offload; from Brad
| -rw-r--r-- | share/man/man4/jme.4 | 9 | ||||
| -rw-r--r-- | sys/dev/pci/if_jme.c | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/share/man/man4/jme.4 b/share/man/man4/jme.4 index 916e80b3de6..05ba0eafc1d 100644 --- a/share/man/man4/jme.4 +++ b/share/man/man4/jme.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: jme.4,v 1.2 2008/10/28 06:25:18 brad Exp $ +.\" $OpenBSD: jme.4,v 1.3 2009/06/05 06:05:06 naddy Exp $ .\" .\" Copyright (c) 2008 Jonathan Gray <jsg@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: October 28 2008 $ +.Dd $Mdocdate: June 5 2009 $ .Dt JME 4 .Os .Sh NAME @@ -31,8 +31,9 @@ JMC260 10/100 and JMC250 10/100/Gigabit Ethernet chips. .Pp The .Nm -driver supports IPv4 receive IP/TCP/UDP checksum offload and VLAN -tag insertion and stripping. +driver supports IPv4 receive IP/TCP/UDP checksum offload, IPv6 +receive TCP/UDP checksum offload and VLAN tag insertion and +stripping. .Pp The following .Ar media diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c index ba8d7f18473..08ef0fee257 100644 --- a/sys/dev/pci/if_jme.c +++ b/sys/dev/pci/if_jme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_jme.c,v 1.18 2009/03/29 21:53:52 sthen Exp $ */ +/* $OpenBSD: if_jme.c,v 1.19 2009/06/05 06:05:06 naddy Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -1689,9 +1689,11 @@ jme_rxpkt(struct jme_softc *sc) m->m_data += JME_RX_PAD_BYTES; /* Set checksum information. */ - if (flags & JME_RD_IPV4) { - if (flags & JME_RD_IPCSUM) - m->m_pkthdr.csum_flags |= M_IPV4_CSUM_IN_OK; + if (flags & (JME_RD_IPV4|JME_RD_IPV6)) { + if ((flags & JME_RD_IPV4) && + (flags & JME_RD_IPCSUM)) + m->m_pkthdr.csum_flags |= + M_IPV4_CSUM_IN_OK; if ((flags & JME_RD_MORE_FRAG) == 0 && ((flags & (JME_RD_TCP | JME_RD_TCPCSUM)) == (JME_RD_TCP | JME_RD_TCPCSUM) || |