Merge "qca-wifi: Extap mode secondary radio unicast packet handling"

qca_multi_link/inc/qca_multi_link.h

@@ -98,7 +98,6 @@ bool qca_multi_link_remove_fastlane_radio(struct wiphy *fl_wiphy);
 bool qca_multi_link_add_no_backhaul_radio(struct wiphy *no_bl_wiphy);
 bool qca_multi_link_remove_no_backhaul_radio(struct wiphy *no_bl_wiphy);
 bool qca_multi_link_ap_rx(struct net_device *net_dev, qdf_nbuf_t nbuf);
-bool qca_multi_link_sta_rx(struct net_device *net_dev, qdf_nbuf_t nbuf,
-			  qca_multi_link_needs_enq_t allow_vap_enq);
+bool qca_multi_link_sta_rx(struct net_device *net_dev, qdf_nbuf_t nbuf);
 bool qca_multi_link_sta_tx(struct net_device *net_dev, qdf_nbuf_t nbuf);
 #endif

qca_multi_link/src/qca_multi_link.c

@@ -671,8 +671,7 @@ qdf_export_symbol(qca_multi_link_ap_rx);
  *	   QCA_MULTI_LINK_PKT_CONSUMED: frame is consumed.
  */
 static qca_multi_link_status_t qca_multi_link_secondary_sta_rx(struct net_device *net_dev,
-							      qdf_nbuf_t nbuf,
-							      qca_multi_link_needs_enq_t allow_vap_enq)
+							      qdf_nbuf_t nbuf)
 {
 	uint8_t is_mcast;
 	qca_multi_link_tbl_entry_t qca_ml_entry;
@@ -766,10 +765,6 @@ static qca_multi_link_status_t qca_multi_link_secondary_sta_rx(struct net_device
 	 */
 	if (qca_multi_link_cfg.loop_detected) {
 
-		if (allow_vap_enq == QCA_MULTI_LINK_SKIP_VAP_ENQ) {
-			return QCA_MULTI_LINK_PKT_ALLOW;
-		}
-
 		qca_ml_entry.qal_fdb_ieee80211_ptr = NULL;
 		qca_ml_entry.qal_fdb_dev = NULL;
 		qca_ml_entry.qal_fdb_is_local = 0;
@@ -941,8 +936,7 @@ static qca_multi_link_status_t qca_multi_link_primary_sta_rx(struct net_device *
  * Return: false: frame not consumed and should be processed further by caller
  *	   true: frame dropped/enqueued.
  */
-bool qca_multi_link_sta_rx(struct net_device *net_dev, qdf_nbuf_t nbuf,
-			  qca_multi_link_needs_enq_t allow_vap_enq)
+bool qca_multi_link_sta_rx(struct net_device *net_dev, qdf_nbuf_t nbuf)
 {
 	uint8_t is_eapol;
 	bool is_primary = false;
@@ -973,7 +967,7 @@ bool qca_multi_link_sta_rx(struct net_device *net_dev, qdf_nbuf_t nbuf,
 	if (is_primary) {
 		status = qca_multi_link_primary_sta_rx(sta_dev, nbuf);
 	} else {
-		status = qca_multi_link_secondary_sta_rx(sta_dev, nbuf, allow_vap_enq);
+		status = qca_multi_link_secondary_sta_rx(sta_dev, nbuf);
 	}
 	dev_put(sta_dev);