renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
Code

staging: wfx: dual CTS is never necessary

Browse Source 
Dual CTS is only necessary when sending/receiving STBC data. However,
the chip does not support STBC, so it is never necessary to enable
double CTS.

We can simplify the code.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200420160311.57323-7-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jérôme Pouiller 2020-04-20 18:03:01 +02:00 committed by Greg Kroah-Hartman
parent 537000acc3
commit d4620087d2
4 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/wfx/hif_api_mib.h
View File

@ -379,12 +379,6 @@ struct hif_mib_protected_mgmt_policy {
u8 reserved2[3]; u8 reserved2[3];
} __packed; } __packed;
struct hif_mib_set_ht_protection {
u8 dual_cts_prot:1;
u8 reserved1:7;
u8 reserved2[3];
} __packed;
struct hif_mib_keep_alive_period { struct hif_mib_keep_alive_period {
__le16 keep_alive_period; __le16 keep_alive_period;
u8 reserved[2]; u8 reserved[2];

10
drivers/staging/wfx/hif_tx_mib.c
View File

@ -365,16 +365,6 @@ int hif_slot_time(struct wfx_vif *wvif, int val)
&arg, sizeof(arg)); &arg, sizeof(arg));
} }
int hif_dual_cts_protection(struct wfx_vif *wvif, bool enable)
{
struct hif_mib_set_ht_protection arg = {
.dual_cts_prot = enable,
};
return hif_write_mib(wvif->wdev, wvif->id, HIF_MIB_ID_SET_HT_PROTECTION,
&arg, sizeof(arg));
}
int hif_wep_default_key_id(struct wfx_vif *wvif, int val) int hif_wep_default_key_id(struct wfx_vif *wvif, int val)
{ {
struct hif_mib_wep_default_key_id arg = { struct hif_mib_wep_default_key_id arg = {

1
drivers/staging/wfx/hif_tx_mib.h
View File

@ -52,7 +52,6 @@ int hif_use_multi_tx_conf(struct wfx_dev *wdev, bool enable);
int hif_set_uapsd_info(struct wfx_vif *wvif, unsigned long val); int hif_set_uapsd_info(struct wfx_vif *wvif, unsigned long val);
int hif_erp_use_protection(struct wfx_vif *wvif, bool enable); int hif_erp_use_protection(struct wfx_vif *wvif, bool enable);
int hif_slot_time(struct wfx_vif *wvif, int val); int hif_slot_time(struct wfx_vif *wvif, int val);
int hif_dual_cts_protection(struct wfx_vif *wvif, bool enable);
int hif_wep_default_key_id(struct wfx_vif *wvif, int val); int hif_wep_default_key_id(struct wfx_vif *wvif, int val);
int hif_rts_threshold(struct wfx_vif *wvif, int val); int hif_rts_threshold(struct wfx_vif *wvif, int val);

6
drivers/staging/wfx/sta.c
View File

@ -482,12 +482,6 @@ static void wfx_join_finalize(struct wfx_vif *wvif,
else else
bss_params.operational_rate_set = -1; bss_params.operational_rate_set = -1;
rcu_read_unlock(); rcu_read_unlock();
if (sta &&
info->ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT)
hif_dual_cts_protection(wvif, true);
else
hif_dual_cts_protection(wvif, false);
// beacon_loss_count is defined to 7 in net/mac80211/mlme.c. Let's use // beacon_loss_count is defined to 7 in net/mac80211/mlme.c. Let's use
// the same value. // the same value.
bss_params.beacon_lost_count = 7; bss_params.beacon_lost_count = 7;