Patchwork [net-next] e1000e: allow tx of pre-formatted vlan tagged packets

login
register
mail settings
Submitter Arthur Jones
Date March 17, 2009, 7:59 p.m.
Message ID <20090317195905.GA22551@ajones-laptop.nbttech.com>
Download mbox | patch
Permalink /patch/24574/
State Awaiting Upstream
Delegated to: David Miller
Headers show

Comments

Arthur Jones - March 17, 2009, 7:59 p.m.
As with igb, when the e1000e driver is fed 802.1q
packets with hardware checksum on, it chokes with an
error of the form:

checksum_partial 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.

Thanks to Kand Ly <kand@riverbed.com> for discovering the
issue and the coming up with a solution.  This patch is
based upon his work.

Fixups from Stephen Hemminger <shemminger@vyatta.com> and
Alexander Duyck <alexander.h.duyck@intel.com>.

Signed-off-by: Arthur Jones <ajones@riverbed.com>
---
 drivers/net/e1000e/netdev.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
David Miller - March 19, 2009, 6:41 a.m.
From: Arthur Jones <ajones@riverbed.com>
Date: Tue, 17 Mar 2009 12:59:05 -0700

> As with igb, when the e1000e driver is fed 802.1q
> packets with hardware checksum on, it chokes with an
> error of the form:
> 
> checksum_partial 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.
> 
> Thanks to Kand Ly <kand@riverbed.com> for discovering the
> issue and the coming up with a solution.  This patch is
> based upon his work.
> 
> Fixups from Stephen Hemminger <shemminger@vyatta.com> and
> Alexander Duyck <alexander.h.duyck@intel.com>.
> 
> Signed-off-by: Arthur Jones <ajones@riverbed.com>

Jeff K., you got this one too?
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Kirsher - March 19, 2009, 6:55 a.m.
On Wed, Mar 18, 2009 at 11:41 PM, David Miller <davem@davemloft.net> wrote:
> From: Arthur Jones <ajones@riverbed.com>
> Date: Tue, 17 Mar 2009 12:59:05 -0700
>
>> As with igb, when the e1000e driver is fed 802.1q
>> packets with hardware checksum on, it chokes with an
>> error of the form:
>>
>> checksum_partial 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.
>>
>> Thanks to Kand Ly <kand@riverbed.com> for discovering the
>> issue and the coming up with a solution.  This patch is
>> based upon his work.
>>
>> Fixups from Stephen Hemminger <shemminger@vyatta.com> and
>> Alexander Duyck <alexander.h.duyck@intel.com>.
>>
>> Signed-off-by: Arthur Jones <ajones@riverbed.com>
>
> Jeff K., you got this one too?
> --

Yes.  I have both.  The are both in my queue, and I should have
something for you Dave later tonight/tomorrow morning.

Patch

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index e74eb3c..6d6221a 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -3769,11 +3769,17 @@  static bool e1000_tx_csum(struct e1000_adapter *adapter, struct sk_buff *skb)
 	unsigned int i;
 	u8 css;
 	u32 cmd_len = E1000_TXD_CMD_DEXT;
+	__be16 protocol;
 
 	if (skb->ip_summed != CHECKSUM_PARTIAL)
 		return 0;
 
-	switch (skb->protocol) {
+	if (skb->protocol == cpu_to_be16(ETH_P_8021Q))
+		protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
+	else
+		protocol = skb->protocol;
+
+	switch (protocol) {
 	case cpu_to_be16(ETH_P_IP):
 		if (ip_hdr(skb)->protocol == IPPROTO_TCP)
 			cmd_len |= E1000_TXD_CMD_TCP;
@@ -3785,7 +3791,8 @@  static bool e1000_tx_csum(struct e1000_adapter *adapter, struct sk_buff *skb)
 		break;
 	default:
 		if (unlikely(net_ratelimit()))
-			e_warn("checksum_partial proto=%x!\n", skb->protocol);
+			e_warn("checksum_partial proto=%x!\n",
+			       be16_to_cpu(protocol));
 		break;
 	}