| Message ID | b80f7904-c6b4-4d12-a5f9-69ab9b965732@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Ping-Ke Shih |
| Headers | show |
| Series | wifi: rtw88: Delete rf_type member of struct rtw_sta_info | expand |
Bitterblue Smith <rtl8821cerfe2@gmail.com> wrote: > > It's not used for anything. > > Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com> Acked-by: Ping-Ke Shih <pkshih@realtek.com> > --- > drivers/net/wireless/realtek/rtw88/main.c | 9 ++------- > drivers/net/wireless/realtek/rtw88/main.h | 1 - > 2 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c > index e91530ed05a0..6993f93c8f06 100644 > --- a/drivers/net/wireless/realtek/rtw88/main.c > +++ b/drivers/net/wireless/realtek/rtw88/main.c > @@ -1217,7 +1217,6 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si, > u8 wireless_set; > u8 bw_mode; > u8 rate_id; > - u8 rf_type = RF_1T1R; > u8 stbc_en = 0; > u8 ldpc_en = 0; > u8 tx_num = 1; > @@ -1302,13 +1301,10 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si, > break; > } > > - if (sta->deflink.vht_cap.vht_supported && ra_mask & 0xffc00000) { > + if (sta->deflink.vht_cap.vht_supported && ra_mask & 0xffc00000) > tx_num = 2; > - rf_type = RF_2T2R; I guess this is to support SMPS dynamically at initial thought, but finally it is not necessary.
diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index e91530ed05a0..6993f93c8f06 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1217,7 +1217,6 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si, u8 wireless_set; u8 bw_mode; u8 rate_id; - u8 rf_type = RF_1T1R; u8 stbc_en = 0; u8 ldpc_en = 0; u8 tx_num = 1; @@ -1302,13 +1301,10 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si, break; } - if (sta->deflink.vht_cap.vht_supported && ra_mask & 0xffc00000) { + if (sta->deflink.vht_cap.vht_supported && ra_mask & 0xffc00000) tx_num = 2; - rf_type = RF_2T2R; - } else if (sta->deflink.ht_cap.ht_supported && ra_mask & 0xfff00000) { + else if (sta->deflink.ht_cap.ht_supported && ra_mask & 0xfff00000) tx_num = 2; - rf_type = RF_2T2R; - } rate_id = get_rate_id(wireless_set, bw_mode, tx_num); @@ -1319,7 +1315,6 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si, si->bw_mode = bw_mode; si->stbc_en = stbc_en; si->ldpc_en = ldpc_en; - si->rf_type = rf_type; si->sgi_enable = is_support_sgi; si->vht_enable = is_vht_enable; si->ra_mask = ra_mask; diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h index 65c7acea41af..6ba9e0dcf9fd 100644 --- a/drivers/net/wireless/realtek/rtw88/main.h +++ b/drivers/net/wireless/realtek/rtw88/main.h @@ -757,7 +757,6 @@ struct rtw_sta_info { u8 mac_id; u8 rate_id; enum rtw_bandwidth bw_mode; - enum rtw_rf_type rf_type; u8 stbc_en:2; u8 ldpc_en:2; bool sgi_enable;
It's not used for anything. Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com> --- drivers/net/wireless/realtek/rtw88/main.c | 9 ++------- drivers/net/wireless/realtek/rtw88/main.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) base-commit: 104372ff359486b26b5a2db33b8e1dc6bfb39812 prerequisite-patch-id: ffa5686d26c03c3bd942dd0e0c4e85d6cc1141c0 prerequisite-patch-id: 5fe117f3707ee7525549baaeea323157019be897 prerequisite-patch-id: f733af9c741a3e02f8dd374a402da4b07c51f97a prerequisite-patch-id: 26c5a5c5739a581686f97ff17916b9c641a0d189 prerequisite-patch-id: 73580f2822eceab5e3a1d7291beebd362b9af45f prerequisite-patch-id: ebd38e2e7e1f7731046d8641dbaaa2bcc9a385fe prerequisite-patch-id: ebc85d1f7996a01b46f27e78dc6ebfb5c5a8c013 prerequisite-patch-id: 4cb1a033c2beec35dfbee0cddb8c8d1df80f2994 prerequisite-patch-id: 3887710d4f2069a49bdeb35d6e17144fe9da9c84 prerequisite-patch-id: 6b23ff2c45082cbce357c8547e5582455b160649