wifi: mac80211_hwsim: Rename pid to portid to avoid confusion
authorJaewan Kim <jaewan@google.com>
Mon, 30 Jan 2023 02:22:52 +0000 (02:22 +0000)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 14 Feb 2023 11:09:18 +0000 (12:09 +0100)
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 <jaewan@google.com>
Link: https://lore.kernel.org/r/20230130022252.1514647-1-jaewan@google.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/mac80211_hwsim.c

index c57c890..4cc4eaf 100644 (file)
@@ -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;