Skip to contentSkip to conversation

vmxnet3: use correct tcp hdr length when packet is encapsulated

PATCH Applied Ronak Doshi 2 participants 2 messages Aug 10, 2020

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

PATCH v2 1/1 vmxnet3: use correct tcp hdr length when packet is encapsulated

Commit dacce2be3312 ("vmxnet3: add geneve and vxlan tunnel offload support") added support for encapsulation offload. However, while calculating tcp hdr length, it does not take into account if the packet is encapsulated or not.

This patch fixes this issue by using correct reference for inner tcp header.

Fixes dacce2be3312 ("vmxnet3: add geneve and vxlan tunnel offload support")

---
Changes in v2:
- Undo changes to driver version
- Fixed commit message

 drivers/net/vmxnet3/vmxnet3_drv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/vmxnet3/vmxnet3_drv.c +2 -1
index ca395f9679d0..2818015324b8 100644
@@ -886,7 +886,8 @@ vmxnet3_parse_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
 
 			switch (protocol) {
 			case IPPROTO_TCP:
-				ctx->l4_hdr_size = tcp_hdrlen(skb);
+				ctx->l4_hdr_size = skb->encapsulation ? inner_tcp_hdrlen(skb) :
+						   tcp_hdrlen(skb);
 				break;
 			case IPPROTO_UDP:
 				ctx->l4_hdr_size = sizeof(struct udphdr);
Signature · 1 line
2.11.0
maintainer Applied
#1 lore raw

From: Ronak Doshi <[email protected]>
Date: Mon, 10 Aug 2020 09:55:55 -0700

Quoted 11 lines

Commit dacce2be3312 ("vmxnet3: add geneve and vxlan tunnel offload support") added support for encapsulation offload. However, while calculating tcp hdr length, it does not take into account if the packet is encapsulated or not.

This patch fixes this issue by using correct reference for inner tcp header.

Fixes dacce2be3312 ("vmxnet3: add geneve and vxlan tunnel offload support")

Applied, thanks.