diff options
| author | Pyun YongHyeon <yongari@FreeBSD.org> | 2008-11-25 04:33:02 +0000 |
|---|---|---|
| committer | Pyun YongHyeon <yongari@FreeBSD.org> | 2008-11-25 04:33:02 +0000 |
| commit | c583cc04efe3d2da517cfd2848d494190fbfd2bf (patch) | |
| tree | d543f43fb7028f9e18d6a263e564b622a15db806 | |
| parent | 4e53f83744095a0cdc6fde608532bb22cdc4b51b (diff) | |
| download | src-c583cc04efe3d2da517cfd2848d494190fbfd2bf.tar.gz src-c583cc04efe3d2da517cfd2848d494190fbfd2bf.zip | |
Simplify Tx checksum offload configuration. Also clear CSUM_IP if
we've computed IP checksum with software method.
Notes
Notes:
svn path=/head/; revision=185286
| -rw-r--r-- | sys/dev/fxp/if_fxp.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 3cdf9d25635d..135681e155bb 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -1295,14 +1295,10 @@ fxp_encap(struct fxp_softc *sc, struct mbuf **m_head) * in the TCP header. The stack should have * already done this for us. */ - if (m->m_pkthdr.csum_flags) { - if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) { - txp->tx_cb->ipcb_ip_schedule = - FXP_IPCB_TCPUDP_CHECKSUM_ENABLE; - if (m->m_pkthdr.csum_flags & CSUM_TCP) - txp->tx_cb->ipcb_ip_schedule |= - FXP_IPCB_TCP_PACKET; - } + if (m->m_pkthdr.csum_flags & FXP_CSUM_FEATURES) { + txp->tx_cb->ipcb_ip_schedule = FXP_IPCB_TCPUDP_CHECKSUM_ENABLE; + if (m->m_pkthdr.csum_flags & CSUM_TCP) + txp->tx_cb->ipcb_ip_schedule |= FXP_IPCB_TCP_PACKET; #ifdef FXP_IP_CSUM_WAR /* @@ -1334,6 +1330,7 @@ fxp_encap(struct fxp_softc *sc, struct mbuf **m_head) ip = mtod(m, struct ip *); ip->ip_sum = in_cksum(m, ip->ip_hl << 2); m->m_data -= ETHER_HDR_LEN; + m->m_pkthdr.csum_flags &= ~CSUM_IP; } else { txp->tx_cb->ipcb_ip_activation_high = FXP_IPCB_HARDWAREPARSING_ENABLE; |