samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linux Build Service Account
2020-07-22 23:44:35 -07:00
committed by Gerrit - the friendly Code Review server
parent a69fa6f81f 0107d0ca4a
commit a413bf278f
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qca_multi_link/inc/qca_multi_link.h
View File

@@ -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_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_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_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, 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_tx(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 #endif

12
qca_multi_link/src/qca_multi_link.c
View File

@@ -671,8 +671,7 @@ qdf_export_symbol(qca_multi_link_ap_rx);
* QCA_MULTI_LINK_PKT_CONSUMED: frame is consumed. * 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, static qca_multi_link_status_t qca_multi_link_secondary_sta_rx(struct net_device *net_dev,
qdf_nbuf_t nbuf, qdf_nbuf_t nbuf)
qca_multi_link_needs_enq_t allow_vap_enq)
{ {
uint8_t is_mcast; uint8_t is_mcast;
qca_multi_link_tbl_entry_t qca_ml_entry; 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 (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_ieee80211_ptr = NULL;
qca_ml_entry.qal_fdb_dev = NULL; qca_ml_entry.qal_fdb_dev = NULL;
qca_ml_entry.qal_fdb_is_local = 0; 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 * Return: false: frame not consumed and should be processed further by caller
* true: frame dropped/enqueued. * true: frame dropped/enqueued.
*/ */
bool qca_multi_link_sta_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)
{ {
uint8_t is_eapol; uint8_t is_eapol;
bool is_primary = false; 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) { if (is_primary) {
status = qca_multi_link_primary_sta_rx(sta_dev, nbuf); status = qca_multi_link_primary_sta_rx(sta_dev, nbuf);
} else { } 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); dev_put(sta_dev);