From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761567AbYFXOiX (ORCPT ); Tue, 24 Jun 2008 10:38:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753497AbYFXOiQ (ORCPT ); Tue, 24 Jun 2008 10:38:16 -0400 Received: from wf-out-1314.google.com ([209.85.200.171]:47955 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752549AbYFXOiP (ORCPT ); Tue, 24 Jun 2008 10:38:15 -0400 Subject: [PATCH] net/inet_lro: remove setting skb->ip_summed when not LRO-able From: Eli Cohen Reply-To: eli@dev.mellanox.co.il To: LKML Cc: Roland Dreier , Vladimir Sokolovsky , Or Gerlitz , OpenFabrics General , Jan-Bernd Themann Content-Type: text/plain Organization: Mellanox Tecnologies Date: Tue, 24 Jun 2008 17:39:46 +0300 Message-Id: <1214318386.23583.37.camel@mtls03> Mime-Version: 1.0 X-Mailer: Evolution 2.12.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>From 59c28d377ddfb7c13e2e1ecbf184211704d0e61d Mon Sep 17 00:00:00 2001 From: Eli Cohen 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. Issue raised by Or Gerlitz Signed-off-by: Eli Cohen --- net/ipv4/inet_lro.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/net/ipv4/inet_lro.c b/net/ipv4/inet_lro.c index 4a4d49f..cfd034a 100644 --- a/net/ipv4/inet_lro.c +++ b/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 */ 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; } -- 1.5.6