Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41825d71 authored by Auke Kok's avatar Auke Kok Committed by Jeff Garzik
Browse files

ixgbe: Correctly obtain protocol information on transmit 



In reply to "RE: [Fwd: [PATCH 2.6.25] ixgbe/igb: correctly obtain protocol
information on transmit]" from Andy Gospodarek:

The driver was incorrectly looking at socket headers for
protocol information, needed for checksumming offload. Fix
this by not looking at the socket but frame headers instead.

This disregards extension headers but it's unclear that linux
generates those anyway.

Tested by Andy Gospodarek.

Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 5918bd88

drivers/net/ixgbe/ixgbe_main.c

+21 −3
Original line number Diff line number Diff line
@@ -2277,11 +2277,29 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter, 
				    IXGBE_ADVTXD_DTYP_CTXT);



		if (skb->ip_summed == CHECKSUM_PARTIAL) {

			if (skb->protocol == htons(ETH_P_IP))

			switch (skb->protocol) {

			case __constant_htons(ETH_P_IP):

				type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;

				if (ip_hdr(skb)->protocol == IPPROTO_TCP)

					type_tucmd_mlhl |=

						IXGBE_ADVTXD_TUCMD_L4T_TCP;

				break;



			if (skb->sk->sk_protocol == IPPROTO_TCP)

				type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_TCP;

			case __constant_htons(ETH_P_IPV6):

				/* XXX what about other V6 headers?? */

				if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)

					type_tucmd_mlhl |=

						IXGBE_ADVTXD_TUCMD_L4T_TCP;

				break;



			default:

				if (unlikely(net_ratelimit())) {

					DPRINTK(PROBE, WARNING,

					 "partial checksum but proto=%x!\n",

					 skb->protocol);

				}

				break;

			}

		}



		context_desc->type_tucmd_mlhl = cpu_to_le32(type_tucmd_mlhl);