From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9FC3C33CA9 for ; Mon, 13 Jan 2020 23:43:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80A662080D for ; Mon, 13 Jan 2020 23:43:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="nBMEj4EK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729255AbgAMXnC (ORCPT ); Mon, 13 Jan 2020 18:43:02 -0500 Received: from frisell.zx2c4.com ([192.95.5.64]:55677 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729211AbgAMXm6 (ORCPT ); Mon, 13 Jan 2020 18:42:58 -0500 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id d929d7a2; Mon, 13 Jan 2020 22:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=0gEIfT81wd3jBIyRff7NNLZ/X d4=; b=nBMEj4EK0pfMGzn0NQVsnr1/oct2+x18C2VKlFh1PKEu4vH3quUJO2Jp9 nzdLxvPZ6aIY6yubJIMPl8GVT3YFJMo2e4Zf0ERdw29iilNSaP+xQQ/x6sUfwH6g PEQv0/mBNZpodW7SCwOVnBU5EuGuYEXhFYOediA4DUI9/OoCgpojWDQtT5Div/Or 9WlwseKbTwDBFEQRfkIJCTx0QQF3Up0Qz4WeiOtzoKMHECNtlOdNBFGvM8fZxByO BFVE8K2mxZ7Ezor4kZrn4VG0K78L1r3RBxvZ5dW/OiuI2B9xzm0kZZCwAwetlWSi kv66TKBYY46QC7XcovE5ZWrpe5zxQ== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 199c41b3 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 13 Jan 2020 22:42:57 +0000 (UTC) From: "Jason A. Donenfeld" To: davem@davemloft.net, johannes@sipsolutions.net, netdev@vger.kernel.org Cc: "Jason A. Donenfeld" Subject: [PATCH net-next 6/8] net: ipv4: use skb_list_walk_safe helper for gso segments Date: Mon, 13 Jan 2020 18:42:31 -0500 Message-Id: <20200113234233.33886-7-Jason@zx2c4.com> In-Reply-To: <20200113234233.33886-1-Jason@zx2c4.com> References: <20200113234233.33886-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is a straight-forward conversion case for the new function, keeping the flow of the existing code as intact as possible. Signed-off-by: Jason A. Donenfeld --- net/ipv4/ip_output.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 14db1e0b8a6e..d84819893db9 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -240,8 +240,8 @@ static int ip_finish_output2(struct net *net, struct sock *sk, struct sk_buff *s static int ip_finish_output_gso(struct net *net, struct sock *sk, struct sk_buff *skb, unsigned int mtu) { + struct sk_buff *segs, *nskb; netdev_features_t features; - struct sk_buff *segs; int ret = 0; /* common case: seglen is <= mtu @@ -272,8 +272,7 @@ static int ip_finish_output_gso(struct net *net, struct sock *sk, consume_skb(skb); - do { - struct sk_buff *nskb = segs->next; + skb_list_walk_safe(segs, segs, nskb) { int err; skb_mark_not_on_list(segs); @@ -281,8 +280,7 @@ static int ip_finish_output_gso(struct net *net, struct sock *sk, if (err && ret == 0) ret = err; - segs = nskb; - } while (segs); + } return ret; } -- 2.24.1