Attachment #216815 for bug #248306

View | Details | Raw Unified | Return to bug 248306
Collapse All | Expand All




	csum_flags = ifp->if_hwassist & m->m_pkthdr.csum_flags;
	eh = mtod(m, struct ether_header *);

	if (csum_flags == 0)
		return;

	switch (ntohs(eh->ether_type)) {
	case ETHERTYPE_IP:
		ipoff = ETHER_HDR_LEN;
		break;
	case ETHERTYPE_IPV6:
		return;
	case ETHERTYPE_VLAN:
		ipoff = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN;
		break;
	default:
		csum_flags = 0;
	}

	if (__predict_true(csum_flags & (CSUM_IP|CSUM_IP_TCP|CSUM_IP_UDP))) {

Return to bug 248306

Lines 2829-2846 mvneta_tx_set_csumflag(struct ifnet *ifp, Link Here

(-)b/sys/dev/neta/if_mvneta.c (-5 / +2 lines)
2829	csum_flags = ifp->if_hwassist & m->m_pkthdr.csum_flags;	2829	csum_flags = ifp->if_hwassist & m->m_pkthdr.csum_flags;
2830	eh = mtod(m, struct ether_header *);	2830	eh = mtod(m, struct ether_header *);
2831		2831
2832	if (csum_flags == 0)
2833	return;
2834
2835	switch (ntohs(eh->ether_type)) {	2832	switch (ntohs(eh->ether_type)) {
2836	case ETHERTYPE_IP:	2833	case ETHERTYPE_IP:
2837	ipoff = ETHER_HDR_LEN;	2834	ipoff = ETHER_HDR_LEN;
2838	break;	2835	break;
2839	case ETHERTYPE_IPV6:
2840	return;
2841	case ETHERTYPE_VLAN:	2836	case ETHERTYPE_VLAN:
2842	ipoff = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN;	2837	ipoff = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN;
2843	break;	2838	break;
		2839	default:
		2840	csum_flags = 0;
2844	}	2841	}
2845		2842
2846	if (__predict_true(csum_flags & (CSUM_IP\|CSUM_IP_TCP\|CSUM_IP_UDP))) {	2843	if (__predict_true(csum_flags & (CSUM_IP\|CSUM_IP_TCP\|CSUM_IP_UDP))) {