Commit a895cb8b authored by Lior David's avatar Lior David Committed by Kalle Valo

wil6210: fix for broadcast workaround in PBSS

Currently we do not have full support for broadcast from
a station inside a PBSS network.
We have a workaround where instead of broadcast we do a
unicast to every known station in the PBSS.
This workaround was performed only for P2P clients.
This fix will perform the broadcast workaround also for a
regular station inside a PBSS.
Signed-off-by: default avatarLior David <qca_liord@qca.qualcomm.com>
Signed-off-by: default avatarMaya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 3ee908dc
...@@ -601,6 +601,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy, ...@@ -601,6 +601,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
goto out; goto out;
} }
wil->privacy = sme->privacy; wil->privacy = sme->privacy;
wil->pbss = sme->pbss;
if (wil->privacy) { if (wil->privacy) {
/* For secure assoc, remove old keys */ /* For secure assoc, remove old keys */
......
...@@ -1195,17 +1195,6 @@ static struct vring *wil_find_tx_bcast_2(struct wil6210_priv *wil, ...@@ -1195,17 +1195,6 @@ static struct vring *wil_find_tx_bcast_2(struct wil6210_priv *wil,
return v; return v;
} }
static struct vring *wil_find_tx_bcast(struct wil6210_priv *wil,
struct sk_buff *skb)
{
struct wireless_dev *wdev = wil->wdev;
if (wdev->iftype != NL80211_IFTYPE_AP)
return wil_find_tx_bcast_2(wil, skb);
return wil_find_tx_bcast_1(wil, skb);
}
static int wil_tx_desc_map(struct vring_tx_desc *d, dma_addr_t pa, u32 len, static int wil_tx_desc_map(struct vring_tx_desc *d, dma_addr_t pa, u32 len,
int vring_index) int vring_index)
{ {
...@@ -1905,12 +1894,26 @@ netdev_tx_t wil_start_xmit(struct sk_buff *skb, struct net_device *ndev) ...@@ -1905,12 +1894,26 @@ netdev_tx_t wil_start_xmit(struct sk_buff *skb, struct net_device *ndev)
pr_once_fw = false; pr_once_fw = false;
/* find vring */ /* find vring */
if (wil->wdev->iftype == NL80211_IFTYPE_STATION) { if (wil->wdev->iftype == NL80211_IFTYPE_STATION && !wil->pbss) {
/* in STA mode (ESS), all to same VRING */ /* in STA mode (ESS), all to same VRING (to AP) */
vring = wil_find_tx_vring_sta(wil, skb); vring = wil_find_tx_vring_sta(wil, skb);
} else { /* direct communication, find matching VRING */ } else if (bcast) {
vring = bcast ? wil_find_tx_bcast(wil, skb) : if (wil->pbss)
wil_find_tx_ucast(wil, skb); /* in pbss, no bcast VRING - duplicate skb in
* all stations VRINGs
*/
vring = wil_find_tx_bcast_2(wil, skb);
else if (wil->wdev->iftype == NL80211_IFTYPE_AP)
/* AP has a dedicated bcast VRING */
vring = wil_find_tx_bcast_1(wil, skb);
else
/* unexpected combination, fallback to duplicating
* the skb in all stations VRINGs
*/
vring = wil_find_tx_bcast_2(wil, skb);
} else {
/* unicast, find specific VRING by dest. address */
vring = wil_find_tx_ucast(wil, skb);
} }
if (unlikely(!vring)) { if (unlikely(!vring)) {
wil_dbg_txrx(wil, "No Tx VRING found for %pM\n", eth->h_dest); wil_dbg_txrx(wil, "No Tx VRING found for %pM\n", eth->h_dest);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment