Skip to contentSkip to conversation

ixgbe: allow tx of pre-formatted vlan tagged packets

PATCH Applied Jeff Kirsher 2 participants 2 messages Dec 15, 2009 – Dec 16, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ixgbe: allow tx of pre-formatted vlan tagged packets

From: Gurucharan Shetty <[email protected]>

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 <[email protected]> for igb (Commit - fa4a7ef36ec834fee1719636b30d2f28f4cb0166).

---

 drivers/net/ixgbe/ixgbe_main.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +12 -1
index 22519fa..47c55d2 100644
@@ -5006,7 +5006,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)
maintainer Applied
#1 lore raw

From: Jeff Kirsher <[email protected]>
Date: Tue, 15 Dec 2009 15:00:31 -0800

Quoted 6 lines

From: Gurucharan Shetty <[email protected]>

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!

...

Quoted 4 lines

Applied.