瀏覽代碼

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

Signed-off-by: Eli Cohen <eli@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
Eli Cohen 17 年之前
父節點
當前提交
251a4b320f
共有 2 個文件被更改,包括 6 次插入3 次删除
  1. 5 1
      include/linux/inet_lro.h
  2. 1 2
      net/ipv4/inet_lro.c

+ 5 - 1
include/linux/inet_lro.h

@@ -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 */
 
 

+ 1 - 2
net/ipv4/inet_lro.c

@@ -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 */
-	skb->ip_summed = lro_mgr->ip_summed;
+out:
 	return 1;
 	return 1;
 }
 }