Revert "qcacld-3.0: Fix NSS being sent to firmware"

This reverts Change-Id: Iad92cc3ce634b69397666f574917b5254a73dcda

There is back and forth happening for expected value of NSS by firmware.
Final agreed upon values are: NSS=1 for 1x1 and NSS=2 for 2x2

Change-Id: I134a118b367c46e1b655a4eb21a6b406a3b25c2a
CRs-Fixed: 1084104

core/mac/src/pe/lim/lim_process_action_frame.c

@@ -575,8 +575,7 @@ static void __lim_process_operating_mode_action_frame(tpAniSirGlobal mac_ctx,
 			(operating_mode_frm->OperatingMode.rxNSS + 1)) {
 		sta_ptr->vhtSupportedRxNss =
 			operating_mode_frm->OperatingMode.rxNSS + 1;
-		lim_set_nss_change(mac_ctx, session,
-			operating_mode_frm->OperatingMode.rxNSS,
+		lim_set_nss_change(mac_ctx, session, sta_ptr->vhtSupportedRxNss,
 			sta_ptr->staIndex, mac_hdr->sa);
 	}
 

core/mac/src/pe/sch/sch_beacon_process.c

@@ -497,7 +497,8 @@ static void update_nss(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
 		       tpSirMacMgmtHdr mgmt_hdr)
 {
 	if (sta_ds->vhtSupportedRxNss != (beacon->OperatingMode.rxNSS + 1)) {
-		sta_ds->vhtSupportedRxNss = beacon->OperatingMode.rxNSS;
+		sta_ds->vhtSupportedRxNss =
+			beacon->OperatingMode.rxNSS + 1;
 		lim_set_nss_change(mac_ctx, session_entry,
 			sta_ds->vhtSupportedRxNss, sta_ds->staIndex,
 			mgmt_hdr->sa);