[7570][7872][7885][9610]wlbt: SGI40 should not be enabled in 2.4G beacon

If the DUT is only 20MHz capable, SGI40 should not be enabled.
Changes done to remove the SGI40 check if the width is 20 MHz.

Change-Id: I38f1b2d5eb9ed850fb8ccec3c460633fbcbedccd
SCSC-Bug-Id: SSB-42343
Signed-off-by: Srishti Piplani <srishti.p@samsung.com>

diff --git a/drivers/net/wireless/scsc/cfg80211_ops.c b/drivers/net/wireless/scsc/cfg80211_ops.c
index b3a6d1df8cc28541a287bbbee85ee40a84a3f982..54bf3a13f8409851a1252acba678c1c6b64b5a99 100755 (executable)
--- a/drivers/net/wireless/scsc/cfg80211_ops.c
+++ b/drivers/net/wireless/scsc/cfg80211_ops.c
@@ -2039,8 +2039,7 @@ int slsi_start_ap(struct wiphy *wiphy, struct net_device *dev,
                /* Enable LDPC, SGI20 and SGI40 for both SoftAP & P2PGO if firmware supports */
                if (cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, settings->beacon.tail, settings->beacon.tail_len)) {
                        u8 enforce_ht_cap1 = sdev->fw_ht_cap[0] & (IEEE80211_HT_CAP_LDPC_CODING |
-                                                                 IEEE80211_HT_CAP_SGI_20 |
-                                                                 IEEE80211_HT_CAP_SGI_40);
+                                                                 IEEE80211_HT_CAP_SGI_20);
                        u8 enforce_ht_cap2 = sdev->fw_ht_cap[1] & (IEEE80211_HT_CAP_RX_STBC >> 8);
 
                        slsi_modify_ies(dev, WLAN_EID_HT_CAPABILITY, (u8 *)settings->beacon.tail,