Author: andre
Date: Fri Jul 5 19:36:34 2013
New Revision: 252828
URL: http://svnweb.freebsd.org/changeset/base/252828
Log:
MFC r243624:
Remove unused and unnecessary CSUM_IP_FRAGS checksumming capability.
Checksumming the IP header of fragments is no different from doing
normal IP headers.
Discussed with: yongari
Note that the definition of CSUM_IP_FRAGS is left in mbuf.h to allow
for stable branch source compatibility.
Modified:
stable/9/sys/dev/bce/if_bce.c
stable/9/sys/dev/bxe/if_bxe.c
stable/9/sys/net/if_vlan.c
stable/9/sys/netinet/ip_output.c
stable/9/sys/sys/mbuf.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/net/ (props changed)
stable/9/sys/sys/ (props changed)
Modified: stable/9/sys/dev/bce/if_bce.c
==============================================================================
--- stable/9/sys/dev/bce/if_bce.c Fri Jul 5 19:35:51 2013
(r252827)
+++ stable/9/sys/dev/bce/if_bce.c Fri Jul 5 19:36:34 2013
(r252828)
@@ -9798,7 +9798,7 @@ bce_dump_mbuf(struct bce_softc *sc, stru
"\15M_FIRSTFRAG\16M_LASTFRAG\21M_VLANTAG"
"\22M_PROMISC\23M_NOFREE",
mp->m_pkthdr.csum_flags,
- "\20\1CSUM_IP\2CSUM_TCP\3CSUM_UDP\4CSUM_IP_FRAGS"
+ "\20\1CSUM_IP\2CSUM_TCP\3CSUM_UDP"
"\5CSUM_FRAGMENT\6CSUM_TSO\11CSUM_IP_CHECKED"
"\12CSUM_IP_VALID\13CSUM_DATA_VALID"
"\14CSUM_PSEUDO_HDR");
Modified: stable/9/sys/dev/bxe/if_bxe.c
==============================================================================
--- stable/9/sys/dev/bxe/if_bxe.c Fri Jul 5 19:35:51 2013
(r252827)
+++ stable/9/sys/dev/bxe/if_bxe.c Fri Jul 5 19:36:34 2013
(r252828)
@@ -16276,7 +16276,7 @@ void bxe_dump_mbuf(struct bxe_softc *sc,
"\15M_FIRSTFRAG\16M_LASTFRAG\21M_VLANTAG"
"\22M_PROMISC\23M_NOFREE",
m->m_pkthdr.csum_flags,
- "\20\1CSUM_IP\2CSUM_TCP\3CSUM_UDP\4CSUM_IP_FRAGS"
+ "\20\1CSUM_IP\2CSUM_TCP\3CSUM_UDP"
"\5CSUM_FRAGMENT\6CSUM_TSO\11CSUM_IP_CHECKED"
"\12CSUM_IP_VALID\13CSUM_DATA_VALID"
"\14CSUM_PSEUDO_HDR");
Modified: stable/9/sys/net/if_vlan.c
==============================================================================
--- stable/9/sys/net/if_vlan.c Fri Jul 5 19:35:51 2013 (r252827)
+++ stable/9/sys/net/if_vlan.c Fri Jul 5 19:36:34 2013 (r252828)
@@ -1491,7 +1491,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_IP_FRAGS | CSUM_FRAGMENT);
+ CSUM_UDP | CSUM_SCTP | CSUM_FRAGMENT);
} else {
ifp->if_capenable = 0;
ifp->if_hwassist = 0;
Modified: stable/9/sys/netinet/ip_output.c
==============================================================================
--- stable/9/sys/netinet/ip_output.c Fri Jul 5 19:35:51 2013
(r252827)
+++ stable/9/sys/netinet/ip_output.c Fri Jul 5 19:36:34 2013
(r252828)
@@ -719,14 +719,12 @@ ip_fragment(struct ip *ip, struct mbuf *
* If the interface will not calculate checksums on
* fragmented packets, then do it here.
*/
- if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA &&
- (if_hwassist_flags & CSUM_IP_FRAGS) == 0) {
+ if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
in_delayed_cksum(m0);
m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
}
#ifdef SCTP
- if (m0->m_pkthdr.csum_flags & CSUM_SCTP &&
- (if_hwassist_flags & CSUM_IP_FRAGS) == 0) {
+ if (m0->m_pkthdr.csum_flags & CSUM_SCTP) {
sctp_delayed_cksum(m0, hlen);
m0->m_pkthdr.csum_flags &= ~CSUM_SCTP;
}
Modified: stable/9/sys/sys/mbuf.h
==============================================================================
--- stable/9/sys/sys/mbuf.h Fri Jul 5 19:35:51 2013 (r252827)
+++ stable/9/sys/sys/mbuf.h Fri Jul 5 19:36:34 2013 (r252828)
@@ -279,7 +279,7 @@ struct mbuf {
#define CSUM_IP 0x0001 /* will csum IP */
#define CSUM_TCP 0x0002 /* will csum TCP */
#define CSUM_UDP 0x0004 /* will csum UDP */
-#define CSUM_IP_FRAGS 0x0008 /* will csum IP
fragments */
+#define CSUM_IP_FRAGS 0x0008 /* removed, left for
compat */
#define CSUM_FRAGMENT 0x0010 /* will do IP
fragmentation */
#define CSUM_TSO 0x0020 /* will do TSO */
#define CSUM_SCTP 0x0040 /* will csum SCTP */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
