lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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 <ogerlitz@voltaire.com>

Signed-off-by: Eli Cohen <eli@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eli Cohen
2008-06-27 20:09:00 -07:00
committed by David S. Miller
parent 9a375803fe
commit 251a4b320f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/inet_lro.h
View File

@@ -84,7 +84,11 @@ struct net_lro_mgr {
from received packets and eth protocol from received packets and eth protocol
is still ETH_P_8021Q */ 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 u32 ip_summed_aggr; /* Set in aggregated SKBs: CHECKSUM_UNNECESSARY
* or CHECKSUM_NONE */ * or CHECKSUM_NONE */

3
net/ipv4/inet_lro.c
View File

@@ -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 */ out2: /* send aggregated SKBs to stack */
lro_flush(lro_mgr, lro_desc); lro_flush(lro_mgr, lro_desc);
out: /* Original SKB has to be posted to stack */ out:
skb->ip_summed = lro_mgr->ip_summed;
return 1; return 1;
} }