diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-11-08 09:18:38 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-11-08 09:18:38 +0000 |
| commit | 564b0a86da57ae6aa7ce59cf8e4b007b101e398f (patch) | |
| tree | 8f5d9278df725690d00174971b6dabda498f1eac /sys/dev/pci/if_ix.c | |
| parent | 1928aa8195c43f534751a4d5716db93d032641cf (diff) | |
Do not depend on IFCAP_CSUM flags when configuring rx checksumming
and correct an incorrect usage of IXGBE_RXCSUM_PCSD. ok henning
Diffstat (limited to 'sys/dev/pci/if_ix.c')
| -rw-r--r-- | sys/dev/pci/if_ix.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c index 948accbb3d7..84a1fa55e5d 100644 --- a/sys/dev/pci/if_ix.c +++ b/sys/dev/pci/if_ix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ix.c,v 1.73 2012/11/06 17:29:39 mikeb Exp $ */ +/* $OpenBSD: if_ix.c,v 1.74 2012/11/08 09:18:37 mikeb Exp $ */ /****************************************************************************** @@ -2826,6 +2826,7 @@ ixgbe_initialize_receive_units(struct ix_softc *sc) } rxcsum = IXGBE_READ_REG(&sc->hw, IXGBE_RXCSUM); + rxcsum &= ~IXGBE_RXCSUM_PCSD; /* Setup RSS */ if (sc->num_queues > 1) { @@ -2864,9 +2865,6 @@ ixgbe_initialize_receive_units(struct ix_softc *sc) rxcsum |= IXGBE_RXCSUM_PCSD; } - if (ifp->if_capabilities & IFCAP_CSUM_IPv4) - rxcsum |= IXGBE_RXCSUM_PCSD; - if (!(rxcsum & IXGBE_RXCSUM_PCSD)) rxcsum |= IXGBE_RXCSUM_IPPCSE; |