diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2011-04-05 18:01:22 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2011-04-05 18:01:22 +0000 |
| commit | 4dc54e7fa6438c983dcb9497296699860bc13f41 (patch) | |
| tree | 0615f65c34b4f93226b68db35c1fe3bf9b830f59 /sys/dev/ic | |
| parent | d4c4b70e6b80a4fccfa10cfd0afd5597c8859890 (diff) | |
mechanic rename M_{TCP|UDP}V4_CSUM_OUT -> M_{TCP|UDP}_CSUM_OUT
ok claudio krw
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/re.c | 12 | ||||
| -rw-r--r-- | sys/dev/ic/xl.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c index b170c6efda3..d4ea548b970 100644 --- a/sys/dev/ic/re.c +++ b/sys/dev/ic/re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re.c,v 1.133 2011/03/13 15:35:20 stsp Exp $ */ +/* $OpenBSD: re.c,v 1.134 2011/04/05 18:01:21 henning Exp $ */ /* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -1707,18 +1707,18 @@ re_encap(struct rl_softc *sc, struct mbuf *m, int *idx) */ if ((m->m_pkthdr.csum_flags & - (M_IPV4_CSUM_OUT|M_TCPV4_CSUM_OUT|M_UDPV4_CSUM_OUT)) != 0) { + (M_IPV4_CSUM_OUT|M_TCP_CSUM_OUT|M_UDP_CSUM_OUT)) != 0) { if (sc->rl_flags & RL_FLAG_DESCV2) { vlanctl |= RL_TDESC_CMD_IPCSUMV2; - if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) + if (m->m_pkthdr.csum_flags & M_TCP_CSUM_OUT) vlanctl |= RL_TDESC_CMD_TCPCSUMV2; - if (m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) + if (m->m_pkthdr.csum_flags & M_UDP_CSUM_OUT) vlanctl |= RL_TDESC_CMD_UDPCSUMV2; } else { csum_flags |= RL_TDESC_CMD_IPCSUM; - if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) + if (m->m_pkthdr.csum_flags & M_TCP_CSUM_OUT) csum_flags |= RL_TDESC_CMD_TCPCSUM; - if (m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) + if (m->m_pkthdr.csum_flags & M_UDP_CSUM_OUT) csum_flags |= RL_TDESC_CMD_UDPCSUM; } } diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c index 3d5eacce92e..b4408d71825 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.99 2010/09/22 08:49:14 claudio Exp $ */ +/* $OpenBSD: xl.c,v 1.100 2011/04/05 18:01:21 henning Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -1661,9 +1661,9 @@ reload: if (m_head->m_pkthdr.csum_flags) { if (m_head->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT) status |= XL_TXSTAT_IPCKSUM; - if (m_head->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) + if (m_head->m_pkthdr.csum_flags & M_TCP_CSUM_OUT) status |= XL_TXSTAT_TCPCKSUM; - if (m_head->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) + if (m_head->m_pkthdr.csum_flags & M_UDP_CSUM_OUT) status |= XL_TXSTAT_UDPCKSUM; } #endif |