qcacmn: Properly increment msg word during rx tlv filter config

Properly increment message word variable while forming rx ring
selection config htt message. Message word should point to
appropriate word before calling individual feature config funcs,
this will help to track exact message word position in calling
function.

Change-Id: Iad6c446ac91fdb5be9286f4fa076847e1728dc74
CRs-Fixed: 3219549

dp/wifi3.0/dp_htt.c

@@ -919,14 +919,6 @@ dp_mon_rx_enable_phy_errors(uint32_t *msg_word,
 		*msg_word = 0;
 		HTT_RX_RING_SELECTION_CFG_PHY_ERR_MASK_CONT_SET
 			(*msg_word, htt_tlv_filter->phy_err_mask_cont);
-
-		/* word 14*/
-		msg_word++;
-		*msg_word = 0;
-	} else {
-		/* word 14*/
-		msg_word += 3;
-		*msg_word = 0;
 	}
 }
 #else
@@ -934,9 +926,6 @@ static inline void
 dp_mon_rx_enable_phy_errors(uint32_t *msg_word,
 			    struct htt_rx_ring_tlv_filter *htt_tlv_filter)
 {
-	/* word 14*/
-	msg_word += 3;
-	*msg_word = 0;
 }
 #endif
 
@@ -1670,6 +1659,10 @@ int htt_h2t_rx_ring_cfg(struct htt_soc *htt_soc, int pdev_id,
 
 	dp_mon_rx_enable_phy_errors(msg_word, htt_tlv_filter);
 
+	/* word 14*/
+	msg_word += 3;
+	*msg_word = 0;
+
 	dp_mon_rx_wmask_subscribe(soc->dp_soc, msg_word, htt_tlv_filter);
 
 	/* "response_required" field should be set if a HTT response message is

dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c

@@ -184,9 +184,6 @@ dp_rx_mon_word_mask_subscribe(uint32_t *msg_word,
 	if (!msg_word || !tlv_filter)
 		return;
 
-	/* word 14 */
-	msg_word += 3;
-	*msg_word = 0;
 	HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_WORD_MASK_SET(*msg_word,
 			tlv_filter->rx_mpdu_start_wmask);