Skip to contentSkip to conversation

ixgbe: allow tx of pre-formatted vlan tagged packets

PATCH In review Gurucharan Shetty 2 participants 5 messages Dec 4, 2009 – Dec 7, 2009

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

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

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

drivers/net/ixgbe/ixgbe_main.c +11 -0
index 77b0381..69157e4 100644
@@ -4810,6 +4810,17 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,
 		                    IXGBE_ADVTXD_DTYP_CTXT);
 
 		if (skb->ip_summed == CHECKSUM_PARTIAL) {
+			__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 (skb->protocol) {
 			case cpu_to_be16(ETH_P_IP):
 				type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;
#1 lore raw
Quoted 15 lines · Gurucharan Shetty

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.

Quoted 7 lines

This patch is a clone of a previously submitted patch by Arthur Jones <[email protected]> for igb (Commit - fa4a7ef36ec834fee1719636b30d2f28f4cb0166).

Thanks, I have added the patch to my queue for testing. After successful testing, I will push to Dave/netdev.

Signature · 2 lines
Cheers,
Jeff
#2 lore raw
Quoted 20 lines · Jeff Kirsher
Quoted 19 lines · Gurucharan Shetty

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

Quoted 7 lines
Quoted 3 lines

Thanks, I have added the patch to my queue for testing. After successful testing, I will push to Dave/netdev.

Oops. I messed up with the patch that I sent. It missed a line. I am re-sending the patch in the next message. Sorry for the inconvenience.

Thanks,
Gurucharan Shetty

#3 lore raw

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

drivers/net/ixgbe/ixgbe_main.c +12 -1
index 77b0381..4eff407 100644
@@ -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)
#4 lore raw
Quoted 43 lines · Gurucharan Shetty

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

drivers/net/ixgbe/ixgbe_main.c +12 -1
index 77b0381..4eff407 100644
@@ -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) {
Quoted 5 lines

                       case cpu_to_be16(ETH_P_IP):
                               type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4; if (ip_hdr(skb)->protocol == IPPROTO_TCP)

Thanks, I have updated the patch in my queue.

Signature · 2 lines
Cheers,
Jeff