Skip to contentSkip to conversation

net/inet_lro: remove setting skb->ip_summed when not LRO-able

PATCH In review Eli Cohen 2 participants 2 messages Jun 25, 2008 – Jun 28, 2008

Subsystems (2)
lore
Share & tools
lore

Eli Cohen

author
#0 lore raw

PATCH v2 1/1 net/inet_lro: remove setting skb->ip_summed when not LRO-able

Quoted 1 line

From 9c5223b8574f364629de4cc8607d97b32f742a7c Mon Sep 17 00:00:00 2001

From: Eli Cohen <[email protected]>
Date: Tue, 24 Jun 2008 17:17:14 +0300
Subject: [PATCH] net/inet_lro: remove setting skb->ip_summed when not LRO-able

When an SKB cannot be chained to a session, the current code attempts to "restore" its ip_summed field from lro_mgr->ip_summed. However, lro_mgr->ip_summed does not hold the original value; in fact, we'd better not touch skb->ip_summed since it is not modified by the code in the path leading to a failure to chain it.
Also use a cleaer comment to the describe the ip_summed field of struct net_lro_mgr.

Issue raised by Or Gerlitz <[email protected]>

---
Changes since previous post:
Updated comment on inet_lro.h for more clarity.

 include/linux/inet_lro.h |    6 +++++-
 net/ipv4/inet_lro.c      |    3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)
include/linux/inet_lro.h +5 -1
index 80335b7..c4335fa 100644
@@ -84,7 +84,11 @@ struct net_lro_mgr {
 				    from received packets and eth protocol
 				    is still ETH_P_8021Q */
 
-	u32 ip_summed;      /* Set in non generated SKBs in page mode */
+	/*
+	 * Set for generated SKBs that are not added to
+	 * the frag list in fragmented mode
+	 */
+	u32 ip_summed;
 	u32 ip_summed_aggr; /* Set in aggregated SKBs: CHECKSUM_UNNECESSARY
 			     * or CHECKSUM_NONE */
 
net/ipv4/inet_lro.c +1 -2
index 4a4d49f..cfd034a 100644
@@ -383,8 +383,7 @@ static int __lro_proc_skb(struct net_lro_mgr *lro_mgr, struct sk_buff *skb,
 out2: /* send aggregated SKBs to stack */
 	lro_flush(lro_mgr, lro_desc);
 
-out:  /* Original SKB has to be posted to stack */
-	skb->ip_summed = lro_mgr->ip_summed;
+out:
 	return 1;
 }
 
Signature · 1 line
1.5.6
maintainer
#1 lore raw

From: Eli Cohen <[email protected]>
Date: Wed, 25 Jun 2008 18:29:12 +0300

Quoted 11 lines

When an SKB cannot be chained to a session, the current code attempts to "restore" its ip_summed field from lro_mgr->ip_summed. However, lro_mgr->ip_summed does not hold the original value; in fact, we'd better not touch skb->ip_summed since it is not modified by the code in the path leading to a failure to chain it.
Also use a cleaer comment to the describe the ip_summed field of struct net_lro_mgr.

Issue raised by Or Gerlitz <[email protected]>

Patch applied, thanks everyone.