From: Philipp Hortmann Date: Sun, 10 Dec 2023 15:26:30 +0000 (+0100) Subject: staging: rtl8192e: Remove variable ht_info->reg_short_gi_40mhz X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e5d021b73bf8cbff52ea11cc4c1191ef5f7e5aff;p=linux.git staging: rtl8192e: Remove variable ht_info->reg_short_gi_40mhz ht_info->reg_short_gi_40mhz is set to 1 and unchanged. Therefore all equations result accordingly and ht_info->reg_short_gi_40mhz can be removed. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/255039e0cb27582a98a0b86340dfe88f14c08a76.1702212003.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 8a4bd389004a2..0664eb86bada5 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -95,7 +95,6 @@ struct rt_hi_throughput { u8 enable_ht; u8 current_ht_support; u8 cur_bw_40mhz; - u8 reg_short_gi_40mhz; u8 cur_short_gi_40mhz; u8 cur_short_gi_20mhz; u8 bCurSuppCCK; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index ed9b3db1a3933..0a5885d6c0a05 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -71,8 +71,6 @@ void ht_update_default_setting(struct rtllib_device *ieee) { struct rt_hi_throughput *ht_info = ieee->ht_info; - ht_info->reg_short_gi_40mhz = 1; - ht_info->amsdu_max_size = 7935UL; ht_info->amsdu_support = 0; @@ -471,9 +469,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) true : false); ht_info->cur_short_gi_20mhz = ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false); - ht_info->cur_short_gi_40mhz = ((ht_info->reg_short_gi_40mhz) ? - ((pPeerHTCap->ShortGI40Mhz == 1) ? - true : false) : false); + ht_info->cur_short_gi_40mhz = ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false); ht_info->bCurSuppCCK = ((pPeerHTCap->DssCCk == 1) ? true : false);