From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gurucharan Shetty Subject: Re: [PATCH] ixgbe: allow tx of pre-formatted vlan tagged packets Date: Mon, 7 Dec 2009 12:04:55 -0800 Message-ID: <1260216295.4226.21.camel@gshetty> References: <1259961156.4198.163.camel@gshetty> <9929d2390912041345g4557770bh1467db58b8ade572@mail.gmail.com> <1260216128.4226.18.camel@gshetty> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: "netdev@vger.kernel.org" , Arthur Jones To: Jeff Kirsher Return-path: Received: from smtp.riverbed.com ([208.70.196.44]:49133 "EHLO smtp2.riverbed.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758820AbZLGUEu (ORCPT ); Mon, 7 Dec 2009 15:04:50 -0500 In-Reply-To: <1260216128.4226.18.camel@gshetty> Sender: netdev-owner@vger.kernel.org List-ID: ixgbe: allow tx of pre-formatted vlan tagged packets When the 82598 is fed 802.1q packets, it chokes with an error of the form: ixgbe: eth0: ixgbe_tx_csum: partial checksum but proto=81! As the logic there was not smart enough to look into the vlan header to pick out the encapsulated protocol. There are times when we'd like to send these packets out without having to configure a vlan on the interface. Here we check for the vlan tag and allow the packet to go out with the correct hardware checksum. This patch is a clone of a previously submitted patch by Arthur Jones for igb (Commit - fa4a7ef36ec834fee1719636b30d2f28f4cb0166). Signed-off-by: Gurucharan Shetty Signed-off-by: Arthur Jones diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 77b0381..4eff407 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -4810,7 +4810,18 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter, IXGBE_ADVTXD_DTYP_CTXT); if (skb->ip_summed == CHECKSUM_PARTIAL) { - switch (skb->protocol) { + __be16 protocol; + + if (skb->protocol == cpu_to_be16(ETH_P_8021Q)) { + const struct vlan_ethhdr *vhdr = + (const struct vlan_ethhdr *)skb->data; + + protocol = vhdr->h_vlan_encapsulated_proto; + } else { + protocol = skb->protocol; + } + + switch (protocol) { case cpu_to_be16(ETH_P_IP): type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4; if (ip_hdr(skb)->protocol == IPPROTO_TCP)