From patchwork Mon Jan 30 02:22:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaewan Kim X-Patchwork-Id: 13120328 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BA25C05027 for ; Mon, 30 Jan 2023 02:23:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235462AbjA3CXD (ORCPT ); Sun, 29 Jan 2023 21:23:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229644AbjA3CXC (ORCPT ); Sun, 29 Jan 2023 21:23:02 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5DC5A261 for ; Sun, 29 Jan 2023 18:23:01 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id 24-20020aa79118000000b00580476432deso4675666pfh.23 for ; Sun, 29 Jan 2023 18:23:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=PzdwsmsA3D8YIhCQCz3L+oPq8XKSSTVC8X126FAhUP0=; b=GpZxcDgAmKkd/rD18FsKwOL91gvKUgeesiepe8mcaCYCmuIcNgngqtiYRp/7e1l1cO VK4lDnjyoZ1esvEJNqMRal4SP5RKxhU/VkLZKF5UjPIWuIV/fuz+z0ML26ZTH8/Ut1Fh ZN7hAE2QxRFmGyJK/wC2TtZcFfHIiBj4u6RGGgbL8b+pukB5YBh19vfDhf0m7HUJqHaP Je0DCx4733ghqexZf4qo92+wdivQaxLDVyeDSbp9pKNC+BSbrwYjIQSaFbwf89BzUy/a QlFTFtGiRXs26Xv9RbcIWqBqJGoS7+/q1TrBHePitgGZGEYwCZNpvqHG2bJULrcb7+9A NhyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=PzdwsmsA3D8YIhCQCz3L+oPq8XKSSTVC8X126FAhUP0=; b=FO9Ly8I7o7g5mCGzAhMIhNsjiCX12c79bkWqn/6NvnWdig3Qhc3n3lQkY24RzmL7HF rOwuYgf9o8+cvqsuzcdfFWHvzWTlTM8C7r/ode9ZXLtmV/gKKXMWqJDYcBDG0Qpc2kzf BI4NUh7/Om39o+8lU04hrv2QQY4E404Gj3vQMrYM4ux3aJUrD9EOLXxhIyBhl5JY05ps lcr09XhPoBfbyMDUqY7PcHBu0y1fcUqWMf2nzvgcFvWACwD47f4css1PsMpH0AwDTfyw HrLRNbiTD12kqpk2jNOTvdbeDUd/sUfJ0XN519MipPBsdmC/LKvlf7xHkrCiFALZRlic c5Gg== X-Gm-Message-State: AFqh2kqmfgyXDobXWTz3Cse/6YEEinAE0uYglQ4CK80qshr6n7cl2c4S fSHSACqBtq5FIns1XnZW+4P5BkP5hso= X-Google-Smtp-Source: AMrXdXuC7MbNT7xFJBXFaD0u3ebPN3W9TsE7pdyknOPg0bubshkDuphFZgsDUbBJ0pUl4wdeQm9E95l9xZI= X-Received: from jaewan1.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:e59]) (user=jaewan job=sendgmr) by 2002:a17:90a:1d01:b0:229:fef3:ac65 with SMTP id c1-20020a17090a1d0100b00229fef3ac65mr5866162pjd.120.1675045381181; Sun, 29 Jan 2023 18:23:01 -0800 (PST) Date: Mon, 30 Jan 2023 02:22:52 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Message-ID: <20230130022252.1514647-1-jaewan@google.com> Subject: [PATCH] mac80211_hwsim: Rename pid to portid to avoid confusion From: Jaewan Kim To: johannes@sipsolutions.net, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Cc: kernel-team@android.com, Jaewan Kim Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org It is a frequent mistake to confuse the netlink port identifier with a process identifier. Try to reduce this confusion by renaming that hold port identifiers portid instead of pid. This change replicates following commit: commit 15e473046cb6 ("netlink: Rename pid to portid to avoid confusion") Signed-off-by: Jaewan Kim --- drivers/net/wireless/mac80211_hwsim.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index c57c8903b7c0..4cc4eaf80b14 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -2034,7 +2034,7 @@ static void mac80211_hwsim_tx_frame(struct ieee80211_hw *hw, struct ieee80211_channel *chan) { struct mac80211_hwsim_data *data = hw->priv; - u32 _pid = READ_ONCE(data->wmediumd); + u32 _portid = READ_ONCE(data->wmediumd); if (ieee80211_hw_check(hw, SUPPORTS_RC_TABLE)) { struct ieee80211_tx_info *txi = IEEE80211_SKB_CB(skb); @@ -2045,8 +2045,8 @@ static void mac80211_hwsim_tx_frame(struct ieee80211_hw *hw, mac80211_hwsim_monitor_rx(hw, skb, chan); - if (_pid || hwsim_virtio_enabled) - return mac80211_hwsim_tx_frame_nl(hw, skb, _pid, chan); + if (_portid || hwsim_virtio_enabled) + return mac80211_hwsim_tx_frame_nl(hw, skb, _portid, chan); data->tx_pkts++; data->tx_bytes += skb->len;