diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2022-02-02 10:49:43 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2022-02-04 16:25:55 +0100 |
| commit | ae962e5f630fe453b3f93a042f6fbce7ad3e6179 (patch) | |
| tree | badbe732e2a7a022f774bb6ab251c5cc38d5859a /net/mac80211 | |
| parent | 6ad1dce5ebda90b6b065253a4f23a5eab7732607 (diff) | |
| download | linux-stable-ae962e5f630fe453b3f93a042f6fbce7ad3e6179.tar.gz linux-stable-ae962e5f630fe453b3f93a042f6fbce7ad3e6179.tar.bz2 linux-stable-ae962e5f630fe453b3f93a042f6fbce7ad3e6179.zip | |
mac80211: airtime: avoid variable shadowing
This isn't very dangerous, since the outer 'rate' variable
isn't even a pointer, but it's still confusing, so use a
different variable inside.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220202104617.8e9b2bfaa0f5.I41c53f754eef28206d04dafc7263ccb99b63d490@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/airtime.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/airtime.c b/net/mac80211/airtime.c index 26d2f8ba7029..ffb7559b36d4 100644 --- a/net/mac80211/airtime.c +++ b/net/mac80211/airtime.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: ISC /* * Copyright (C) 2019 Felix Fietkau <nbd@nbd.name> + * Copyright (C) 2021 Intel Corporation */ #include <net/mac80211.h> @@ -650,12 +651,12 @@ u32 ieee80211_calc_expected_tx_airtime(struct ieee80211_hw *hw, struct sta_info *sta = container_of(pubsta, struct sta_info, sta); struct ieee80211_rx_status stat; - struct ieee80211_tx_rate *rate = &sta->tx_stats.last_rate; + struct ieee80211_tx_rate *tx_rate = &sta->tx_stats.last_rate; struct rate_info *ri = &sta->tx_stats.last_rate_info; u32 duration, overhead; u8 agg_shift; - if (ieee80211_fill_rx_status(&stat, hw, rate, ri, band, len)) + if (ieee80211_fill_rx_status(&stat, hw, tx_rate, ri, band, len)) return 0; if (stat.encoding == RX_ENC_LEGACY || !ampdu) |