From patchwork Mon Apr 29 23:02:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sridhar Samudrala X-Patchwork-Id: 240527 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CBE6D2C00C4 for ; Tue, 30 Apr 2013 09:03:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758959Ab3D2XDM (ORCPT ); Mon, 29 Apr 2013 19:03:12 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:47008 "EHLO e35.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758424Ab3D2XDK (ORCPT ); Mon, 29 Apr 2013 19:03:10 -0400 Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 29 Apr 2013 17:03:10 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 29 Apr 2013 17:03:07 -0600 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 6920F19D8036 for ; Mon, 29 Apr 2013 17:03:00 -0600 (MDT) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3TN2hmf095924 for ; Mon, 29 Apr 2013 17:02:47 -0600 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3TN5bkP026108 for ; Mon, 29 Apr 2013 17:05:37 -0600 Received: from [9.70.94.9] (sridhar.usor.ibm.com [9.70.94.9]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3TN5bAe026075; Mon, 29 Apr 2013 17:05:37 -0600 Subject: [PATCH net-next] net: Use consume_skb() to free gso segmented skb From: Sridhar Samudrala To: davem@davemloft.net Cc: netdev@vger.kernel.org Date: Mon, 29 Apr 2013 16:02:42 -0700 Message-ID: <1367276562.23068.7.camel@sridhar.usor.ibm.com> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 (2.28.3-24.el6) X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13042923-4834-0000-0000-0000065393AD Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use consume_skb() to free the original skb that is successfully transmitted as gso segmented skbs so that it is not treated as a drop due to an error. Signed-off-by: Sridhar Samudrala Acked-by: Eric Dumazet --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/core/dev.c b/net/core/dev.c index 7c30dce..4040673 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2565,8 +2565,11 @@ gso: } while (skb->next); out_kfree_gso_skb: - if (likely(skb->next == NULL)) + if (likely(skb->next == NULL)) { skb->destructor = DEV_GSO_CB(skb)->destructor; + consume_skb(skb); + return rc; + } out_kfree_skb: kfree_skb(skb); out: