Author: andre
Date: Mon Aug 19 10:20:20 2013
New Revision: 254516
URL: http://svnweb.freebsd.org/changeset/base/254516
Log:
Remove unused and incomplete support for delayed fragment checksums
from bce(4), bxe(4), mge(4) and ti(4) drivers.
Modified:
head/sys/dev/bce/if_bce.c
head/sys/dev/bxe/if_bxe.c
head/sys/dev/mge/if_mge.c
head/sys/dev/ti/if_ti.c
Modified: head/sys/dev/bce/if_bce.c
==============================================================================
--- head/sys/dev/bce/if_bce.c Mon Aug 19 09:49:51 2013 (r254515)
+++ head/sys/dev/bce/if_bce.c Mon Aug 19 10:20:20 2013 (r254516)
@@ -9821,9 +9821,7 @@ bce_dump_mbuf(struct bce_softc *sc, stru
if (mp->m_flags & M_PKTHDR) {
BCE_PRINTF("- m_pkthdr: len = %d, flags = 0x%b, "
"csum_flags = %b\n", mp->m_pkthdr.len,
- mp->m_flags, "\20\12M_BCAST\13M_MCAST\14M_FRAG"
- "\15M_FIRSTFRAG\16M_LASTFRAG\21M_VLANTAG"
- "\22M_PROMISC\23M_NOFREE",
+ mp->m_flags, M_FLAG_PRINTF,
mp->m_pkthdr.csum_flags,
"\20\1CSUM_IP\2CSUM_TCP\3CSUM_UDP"
"\5CSUM_FRAGMENT\6CSUM_TSO\11CSUM_IP_CHECKED"
Modified: head/sys/dev/bxe/if_bxe.c
==============================================================================
--- head/sys/dev/bxe/if_bxe.c Mon Aug 19 09:49:51 2013 (r254515)
+++ head/sys/dev/bxe/if_bxe.c Mon Aug 19 10:20:20 2013 (r254516)
@@ -16265,9 +16265,7 @@ void bxe_dump_mbuf(struct bxe_softc *sc,
if (m->m_flags & M_PKTHDR) {
BXE_PRINTF("- m_pkthdr: len = %d, flags = 0x%b, "
"csum_flags = %b\n", m->m_pkthdr.len,
- m->m_flags, "\20\12M_BCAST\13M_MCAST\14M_FRAG"
- "\15M_FIRSTFRAG\16M_LASTFRAG\21M_VLANTAG"
- "\22M_PROMISC\23M_NOFREE",
+ m->m_flags, M_FLAG_PRINTF,
m->m_pkthdr.csum_flags,
"\20\1CSUM_IP\2CSUM_TCP\3CSUM_UDP"
"\5CSUM_FRAGMENT\6CSUM_TSO\11CSUM_IP_CHECKED"
Modified: head/sys/dev/mge/if_mge.c
==============================================================================
--- head/sys/dev/mge/if_mge.c Mon Aug 19 09:49:51 2013 (r254515)
+++ head/sys/dev/mge/if_mge.c Mon Aug 19 10:20:20 2013 (r254516)
@@ -1703,9 +1703,7 @@ mge_offload_setup_descriptor(struct mge_
ip = (struct ip *)(m0->m_data + ehlen);
cmd_status |= MGE_TX_IP_HDR_SIZE(ip->ip_hl);
-
- if ((m0->m_flags & M_FRAG) == 0)
- cmd_status |= MGE_TX_NOT_FRAGMENT;
+ cmd_status |= MGE_TX_NOT_FRAGMENT;
}
if (csum_flags & CSUM_IP)
Modified: head/sys/dev/ti/if_ti.c
==============================================================================
--- head/sys/dev/ti/if_ti.c Mon Aug 19 09:49:51 2013 (r254515)
+++ head/sys/dev/ti/if_ti.c Mon Aug 19 10:20:20 2013 (r254516)
@@ -3159,24 +3159,6 @@ ti_start_locked(struct ifnet *ifp)
break;
/*
- * XXX
- * safety overkill. If this is a fragmented packet chain
- * with delayed TCP/UDP checksums, then only encapsulate
- * it if we have enough descriptors to handle the entire
- * chain at once.
- * (paranoia -- may not actually be needed)
- */
- if (m_head->m_flags & M_FIRSTFRAG &&
- m_head->m_pkthdr.csum_flags & (CSUM_DELAY_DATA)) {
- if ((TI_TX_RING_CNT - sc->ti_txcnt) <
- m_head->m_pkthdr.csum_data + 16) {
- IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
- ifp->if_drv_flags |= IFF_DRV_OACTIVE;
- break;
- }
- }
-
- /*
* Pack the data into the transmit ring. If we
* don't have room, set the OACTIVE flag and wait
* for the NIC to drain the ring.
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
