diff options
| author | Philipp Hortmann <philipp.g.hortmann@gmail.com> | 2023-12-10 18:26:10 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-15 15:35:20 +0300 |
| commit | c2386096b8317c79d4644d960d32de00dc38915b (patch) | |
| tree | 4a361c1ef6016e372c535aca1d6c0fdb49e7cfcb | |
| parent | 1f76ce4fc0e3fcc17468ad5d7ae7fb2a8e0c4b43 (diff) | |
| download | linux-c2386096b8317c79d4644d960d32de00dc38915b.tar.xz | |
staging: rtl8192e: Remove variable ht_info->reg_bw_40mhz
ht_info->reg_bw_40mhz is set to 1 and unchanged. Therefore all equations
result accordingly and ht_info->reg_bw_40mhz can be removed.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/4ff7afdc2ada8095c95f053381834cea9f5796bf.1702212003.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_HT.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_HTProc.c | 14 |
2 files changed, 3 insertions, 12 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index c004020099e3..bbfdfb79c6f2 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -94,7 +94,6 @@ enum ht_aggre_mode { struct rt_hi_throughput { u8 enable_ht; u8 current_ht_support; - u8 reg_bw_40mhz; u8 cur_bw_40mhz; u8 reg_short_gi_40mhz; u8 cur_short_gi_40mhz; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 99626be899fd..f81d9ba9c9f5 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -74,12 +74,7 @@ void ht_update_default_setting(struct rtllib_device *ieee) ht_info->reg_short_gi_20mhz = 1; ht_info->reg_short_gi_40mhz = 1; - ht_info->reg_bw_40mhz = 1; - - if (ht_info->reg_bw_40mhz) - ht_info->reg_supp_cck = 1; - else - ht_info->reg_supp_cck = true; + ht_info->reg_supp_cck = 1; ht_info->amsdu_max_size = 7935UL; ht_info->amsdu_support = 0; @@ -275,7 +270,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) pCapELE->ChlWidth = 0; else - pCapELE->ChlWidth = (pHT->reg_bw_40mhz ? 1 : 0); + pCapELE->ChlWidth = 1; pCapELE->MimoPwrSave = pHT->self_mimo_ps; pCapELE->GreenField = 0; @@ -286,7 +281,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, pCapELE->RxSTBC = 0; pCapELE->DelayBA = 0; pCapELE->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0; - pCapELE->DssCCk = ((pHT->reg_bw_40mhz) ? (pHT->reg_supp_cck ? 1 : 0) : 0); + pCapELE->DssCCk = (pHT->reg_supp_cck ? 1 : 0); pCapELE->PSMP = 0; pCapELE->LSigTxopProtect = 0; @@ -734,9 +729,6 @@ void HTSetConnectBwMode(struct rtllib_device *ieee, { struct rt_hi_throughput *ht_info = ieee->ht_info; - if (!ht_info->reg_bw_40mhz) - return; - if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) bandwidth = HT_CHANNEL_WIDTH_20; |