diff options
| author | glebius <glebius@FreeBSD.org> | 2014-09-03 08:30:18 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2014-09-03 08:30:18 +0000 |
| commit | 2e01608625bd63637f497eeabe62349603566c23 (patch) | |
| tree | a2f86afa0ca99dcc68dd6e6c4947c91ea5777cb1 | |
| parent | 4248847477626776ce01157c9d7def246f17f486 (diff) | |
| download | FreeBSD-src-2e01608625bd63637f497eeabe62349603566c23.zip FreeBSD-src-2e01608625bd63637f497eeabe62349603566c23.tar.gz | |
Clean up unused CSUM_FRAGMENT.
Sponsored by: Nginx, Inc.
| -rw-r--r-- | sys/net/if_vlan.c | 2 | ||||
| -rw-r--r-- | sys/netinet/ip_fastfwd.c | 3 | ||||
| -rw-r--r-- | sys/netinet/ip_output.c | 3 | ||||
| -rw-r--r-- | sys/netpfil/pf/pf.c | 3 | ||||
| -rw-r--r-- | sys/sys/mbuf.h | 1 |
5 files changed, 4 insertions, 8 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 763020b..f551ffd 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1501,7 +1501,7 @@ vlan_capabilities(struct ifvlan *ifv) p->if_capenable & IFCAP_VLAN_HWTAGGING) { ifp->if_capenable = p->if_capenable & IFCAP_HWCSUM; ifp->if_hwassist = p->if_hwassist & (CSUM_IP | CSUM_TCP | - CSUM_UDP | CSUM_SCTP | CSUM_FRAGMENT); + CSUM_UDP | CSUM_SCTP); } else { ifp->if_capenable = 0; ifp->if_hwassist = 0; diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c index 458b006..5b41dfd 100644 --- a/sys/netinet/ip_fastfwd.c +++ b/sys/netinet/ip_fastfwd.c @@ -523,8 +523,7 @@ passout: else mtu = ifp->if_mtu; - if (ip_len <= mtu || - (ifp->if_hwassist & CSUM_FRAGMENT && (ip_off & IP_DF) == 0)) { + if (ip_len <= mtu) { /* * Avoid confusing lower layers. */ diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 4aea44f..8503b2f 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -624,8 +624,7 @@ passout: * care of the fragmentation for us, we can just send directly. */ if (ip_len <= mtu || - (m->m_pkthdr.csum_flags & ifp->if_hwassist & CSUM_TSO) != 0 || - ((ip_off & IP_DF) == 0 && (ifp->if_hwassist & CSUM_FRAGMENT))) { + (m->m_pkthdr.csum_flags & ifp->if_hwassist & CSUM_TSO) != 0) { ip->ip_sum = 0; if (m->m_pkthdr.csum_flags & CSUM_IP & ~ifp->if_hwassist) { ip->ip_sum = in_cksum(m, hlen); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 498a321..7e90b61 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5332,8 +5332,7 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp, * care of the fragmentation for us, we can just send directly. */ if (ip_len <= ifp->if_mtu || - (m0->m_pkthdr.csum_flags & ifp->if_hwassist & CSUM_TSO) != 0 || - ((ip_off & IP_DF) == 0 && (ifp->if_hwassist & CSUM_FRAGMENT))) { + (m0->m_pkthdr.csum_flags & ifp->if_hwassist & CSUM_TSO) != 0) { ip->ip_sum = 0; if (m0->m_pkthdr.csum_flags & CSUM_IP & ~ifp->if_hwassist) { ip->ip_sum = in_cksum(m0, ip->ip_hl << 2); diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index b12cdfe..abedc30 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -445,7 +445,6 @@ void sf_ext_free(void *, void *); #define CSUM_UDP_IPV6 CSUM_IP6_UDP #define CSUM_TCP_IPV6 CSUM_IP6_TCP #define CSUM_SCTP_IPV6 CSUM_IP6_SCTP -#define CSUM_FRAGMENT 0x0 /* Unused */ /* * mbuf types describing the content of the mbuf (including external storage). |
