wifi: rtw89: declare support bands with const
Ping-Ke Shih
maintainerPATCH 1/2 wifi: rtw89: declare support bands with const
From: Zong-Zhe Yang <[email protected]>
They are just default declarations and we won't modify them directly. Instead, we actually do moification on their memdup now. So, they should be declared with const.
--- drivers/net/wireless/realtek/rtw89/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +3 -3
@@ -171,7 +171,7 @@ bool rtw89_ra_report_to_bitrate(struct rtw89_dev *rtwdev, u8 rpt_rate, u16 *bitrreturn true; } -static struct ieee80211_supported_band rtw89_sband_2ghz = { +static const struct ieee80211_supported_band rtw89_sband_2ghz = { .band =NL80211_BAND_2GHZ , .channels = rtw89_channels_2ghz, .n_channels =ARRAY_SIZE (rtw89_channels_2ghz),
@@ -181,7 +181,7 @@ static struct ieee80211_supported_band rtw89_sband_2ghz = { .vht_cap = {0}, }; -static struct ieee80211_supported_band rtw89_sband_5ghz = { +static const struct ieee80211_supported_band rtw89_sband_5ghz = { .band =NL80211_BAND_5GHZ , .channels = rtw89_channels_5ghz, .n_channels = ARRAY_SIZE(rtw89_channels_5ghz),
@@ -193,7 +193,7 @@ static struct ieee80211_supported_band rtw89_sband_5ghz = { .vht_cap = {0}, }; -static struct ieee80211_supported_band rtw89_sband_6ghz = { +static const struct ieee80211_supported_band rtw89_sband_6ghz = { .band =NL80211_BAND_6GHZ , .channels = rtw89_channels_6ghz, .n_channels = ARRAY_SIZE(rtw89_channels_6ghz),
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 2/2 wifi: rtw89: 8852c: make table of RU mask constant
This table must be constant, so change it as expectation.
--- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/rtw8852c.c +2 -2
@@ -1683,12 +1683,12 @@ static void rtw8852c_set_channel_bb(struct rtw89_dev *rtwdev,const struct rtw89_chan *chan, enum rtw89_phy_idx phy_idx) { + static const u32 ru_alloc_msk[2] = {B_P80_AT_HIGH_FREQ_RU_ALLOC_PHY0, +B_P80_AT_HIGH_FREQ_RU_ALLOC_PHY1 };struct rtw89_hal *hal = &rtwdev->hal;bool cck_en = chan->band_type ==RTW89_BAND_2G ;u8 pri_ch_idx = chan->pri_ch_idx;u32 mask, reg; -u32 ru_alloc_msk[2 ] = {B_P80_AT_HIGH_FREQ_RU_ALLOC_PHY0 , -B_P80_AT_HIGH_FREQ_RU_ALLOC_PHY1 };u8 ntx_path;if (chan->band_type ==RTW89_BAND_2G )
Signature · 1 line
2.25.1
Quoted 8 lines · Ping-Ke Shih
From: Zong-Zhe Yang <[email protected]>
They are just default declarations and we won't modify them directly. Instead, we actually do moification on their memdup now. So, they should be declared with const.
Signed-off-by Zong-Zhe Yang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
2 patches applied to wireless-next.git, thanks.
a29dba478b6f wifi: rtw89: declare support bands with const e69ae29e00ce wifi: rtw89: 8852c: make table of RU mask constant
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches