From patchwork Fri Jan 22 14:12:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 368646 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1583909jam; Fri, 22 Jan 2021 06:54:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLiZSme4jgVuiTnSAhcGpwIgzI7I9I5xcx2VPFWRxltd1ErdBx6c9gkK9zD4ZPiz8JxjQ+ X-Received: by 2002:a17:906:ecb3:: with SMTP id qh19mr3128890ejb.113.1611327277433; Fri, 22 Jan 2021 06:54:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611327277; cv=none; d=google.com; s=arc-20160816; b=HYs8CROvv1nOacqY0nynt0qnazZpjlpf/34uZfj8/Geo9GMuBMrFtiHc7AGlalHvay dDV/hv/OpooNybGhK/0S+UukDvvax6R5qNTP6t8iBEpWhVGQUxLB/JRzxePIWJsa1a8K XhScsYZLWt0cMuiDy5LNYZiIv8F/jDyjBi5se9AO301omPQFpi1gifUaQGexsic3yFLh bALTnE8szNIKnpg2XKk6nPrMKmHk0h79hcFiIJj0/MmaGuX4136llD72a96ddqi4p7e2 b/sxDZrMNFG40PtrFnp/D41haVjjRbxLMsD5LrRCkaxNxnfX2frMdQ1Zw3bi9JGNRThS 8QkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QBKu+p2U0CLcYz9pj8wrSknv0HzswzT6Ijat9B9/0cI=; b=rpNz7DSDXv5Asv5f7ncFshuQdeu4tlgwomOw5YEldgK9rbLrXYjGJHUyShfkM4j1pW 54noddjuNtM2VtvFfjT3IUHAOXouD2XFB7Iz22SuhkTDw2bi685zGQyH90kcAptwses3 mEDKHU/ymbr4sIUPNJ6LR6BLooQkB096o8BK3FjeA9FS2OjQBegMFgBm9YJR+jb/8WRq A5jma1St6Z4+WhRVpSRnAORoUxkOkqV0WKVqZIq8+U0lpJ7+K0DHMxEDflxeUo5ftf34 Y9EaZuZ3fp4TS1J6kPjDsja59tH3EzKLhp0/DVfNKxqAitsVtIpWqjqvy46UCjky1SAH Mq2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Qqfn5z/j"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cx18si2989260ejb.704.2021.01.22.06.54.37; Fri, 22 Jan 2021 06:54:37 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Qqfn5z/j"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728499AbhAVOxx (ORCPT + 13 others); Fri, 22 Jan 2021 09:53:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:40026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728146AbhAVOXj (ORCPT ); Fri, 22 Jan 2021 09:23:39 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id CF2AA23B88; Fri, 22 Jan 2021 14:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1611325081; bh=o/eurK4c6tuXNbBi3YWhTOliawOpWz+i9hcPPayYzGg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qqfn5z/jQ8CMzhfcg9oh3yThij77D0pdIDpQiSJyglBLfijy6PzQGD0E3fP/V+PBN MspR+wlLKkXwPV8sHEN9amIoOV2xQri+li8pj8bAodAiJGZ8QvI6nKpsf8HKtZv+8B GGaCVDaN6UypQFgES2U8KbDYC75Y2ldru5U1wQ9U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Jason A. Donenfeld" , "David S. Miller" Subject: [PATCH 5.4 15/33] net: skbuff: disambiguate argument and member for skb_list_walk_safe helper Date: Fri, 22 Jan 2021 15:12:31 +0100 Message-Id: <20210122135734.198767015@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210122135733.565501039@linuxfoundation.org> References: <20210122135733.565501039@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jason A. Donenfeld commit 5eee7bd7e245914e4e050c413dfe864e31805207 upstream. This worked before, because we made all callers name their next pointer "next". But in trying to be more "drop-in" ready, the silliness here is revealed. This commit fixes the problem by making the macro argument and the member use different names. Signed-off-by: Jason A. Donenfeld Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- include/linux/skbuff.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1481,9 +1481,9 @@ static inline void skb_mark_not_on_list( } /* Iterate through singly-linked GSO fragments of an skb. */ -#define skb_list_walk_safe(first, skb, next) \ - for ((skb) = (first), (next) = (skb) ? (skb)->next : NULL; (skb); \ - (skb) = (next), (next) = (skb) ? (skb)->next : NULL) +#define skb_list_walk_safe(first, skb, next_skb) \ + for ((skb) = (first), (next_skb) = (skb) ? (skb)->next : NULL; (skb); \ + (skb) = (next_skb), (next_skb) = (skb) ? (skb)->next : NULL) static inline void skb_list_del_init(struct sk_buff *skb) {