Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1265488pxb; Fri, 22 Jan 2021 10:58:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJw49ksJAu2nDCwFnYm/461ECCSZwh0+uAvuxzndIH5Pw1UvH5xyXWnM5uCTF2Huor2mhZmo X-Received: by 2002:a17:907:9863:: with SMTP id ko3mr3971046ejc.498.1611341923408; Fri, 22 Jan 2021 10:58:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611341923; cv=none; d=google.com; s=arc-20160816; b=J7yw6jSQiTMbObWyHHoZd8+jZyD/kNk/RU+tC3glqhMmqxVCHdvaZPIl7y3POBx6Pp 2Dh0/5KnV9cCADIglV9wil4vVwV/HEhdkdyhb7ek1QMZmoagAp6kNLXb56KXPIgYAEpc lwAd0siJHvB27QZGAN6T8VFr13daHakIu9uyQ9r93QSOIaAfyQnAURrBtvdy9Me+mjlo JSuePsRNQWQtmd78UEuNwyEtUiQft9iMR/yvRvLB6Js/xic3qDT22FHwC8giArPUTajD uiIqXrR3ElozDVAhbyzlX0h3NbQW9lDVABz9nqLv/IbVPGx8HYnz7TLja2f4hcOtjEgR vLAg== 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=vWBI1ihjpOAgKmCI0uc7LVi1mEHFqumrTfiU2PQMynA=; b=ERNJne0ujC6aUNFJf0CvDcUufPfdSHQg3uG+/lJYyHA4R5tWMIPOkLEAzwxqoixpDB WMSl54xf1e8GOYx9WlmUB4V8ei9MT5NXIS4rd8Yez6nzOEWn+EIQHje/UUkexMDL9Yon 1vu0JmjvbQIYGiqL/7mgHMxHIfKVZjYFryQ+Bc3pBJ10NjgUI7fZYC2g8o1TBpR9i7VU o63Yfhs0Kr0LXPj2EOl746fzolE8w0h4dVYPiVfKARIG6zlxjplt3gvOEUxxetDxovEk hEct4otjFYKiZAGatumlclcbw5eDQoSx72Uf7RdtcRUoIOdEjgEXuSOFEiq7Ic4lZBYi CbYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Kb9b8yFz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 bk4si3276365ejb.448.2021.01.22.10.58.18; Fri, 22 Jan 2021 10:58:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=Kb9b8yFz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1730343AbhAVSyM (ORCPT + 99 others); Fri, 22 Jan 2021 13:54:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:38816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728526AbhAVOWB (ORCPT ); Fri, 22 Jan 2021 09:22:01 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 83FA123B4B; Fri, 22 Jan 2021 14:15:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1611324960; bh=IiIscfHhCqdcjwH5xQw1Itg+sTThc7rQI0Q+rNAvJ0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kb9b8yFzseQ2kVMpzpVVw0slqGMhFzoOLK1GQaCMs9WSRdnP3z8/XONjAQpn9Uz9N ZiTiNqLKWX6/HnpYxrU8yl1Xc4MazQKUPWQeMQIOb64oh7SuoZpTjNlFzERlgmrHic VHDch3W9Huw/YscOOG+DGpLQAgPmgTXdvuaKy1nA= 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 4.19 20/22] net: skbuff: disambiguate argument and member for skb_list_walk_safe helper Date: Fri, 22 Jan 2021 15:12:38 +0100 Message-Id: <20210122135732.711507800@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210122135731.921636245@linuxfoundation.org> References: <20210122135731.921636245@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -1364,9 +1364,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) {