From: "Jérôme Pouiller" <Jerome.Pouiller@silabs.com>
To: "devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Kalle Valo" <kvalo@codeaurora.org>,
"David S . Miller" <davem@davemloft.net>,
"Jérôme Pouiller" <Jerome.Pouiller@silabs.com>
Subject: [PATCH 45/65] staging: wfx: remove handling of "early_data"
Date: Wed, 15 Jan 2020 12:13:09 +0000 [thread overview]
Message-ID: <20200115121041.10863-46-Jerome.Pouiller@silabs.com> (raw)
In-Reply-To: <20200115121041.10863-1-Jerome.Pouiller@silabs.com>
From: Jérôme Pouiller <jerome.pouiller@silabs.com>
It seems that purpose of "early_data" was to prevent sending data to
mac80211 before station was completely associated. It is a useless
precaution.
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
drivers/staging/wfx/data_rx.c | 17 +----------------
drivers/staging/wfx/data_tx.c | 3 ---
drivers/staging/wfx/data_tx.h | 1 -
drivers/staging/wfx/sta.c | 3 ---
4 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/drivers/staging/wfx/data_rx.c b/drivers/staging/wfx/data_rx.c
index 0ab71c911f84..e26bc665b2b3 100644
--- a/drivers/staging/wfx/data_rx.c
+++ b/drivers/staging/wfx/data_rx.c
@@ -108,7 +108,6 @@ void wfx_rx_cb(struct wfx_vif *wvif,
struct ieee80211_hdr *frame = (struct ieee80211_hdr *)skb->data;
struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data;
struct wfx_link_entry *entry = NULL;
- bool early_data = false;
memset(hdr, 0, sizeof(*hdr));
@@ -121,9 +120,6 @@ void wfx_rx_cb(struct wfx_vif *wvif,
if (link_id && link_id <= WFX_MAX_STA_IN_AP_MODE) {
entry = &wvif->link_id_db[link_id - 1];
entry->timestamp = jiffies;
- if (entry->status == WFX_LINK_SOFT &&
- ieee80211_is_data(frame->frame_control))
- early_data = true;
}
if (arg->status == HIF_STATUS_MICFAILURE)
@@ -181,18 +177,7 @@ void wfx_rx_cb(struct wfx_vif *wvif,
schedule_work(&wvif->update_filtering_work);
}
}
-
- if (early_data) {
- spin_lock_bh(&wvif->ps_state_lock);
- /* Double-check status with lock held */
- if (entry->status == WFX_LINK_SOFT)
- skb_queue_tail(&entry->rx_queue, skb);
- else
- ieee80211_rx_irqsafe(wvif->wdev->hw, skb);
- spin_unlock_bh(&wvif->ps_state_lock);
- } else {
- ieee80211_rx_irqsafe(wvif->wdev->hw, skb);
- }
+ ieee80211_rx_irqsafe(wvif->wdev->hw, skb);
return;
diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c
index 704ebfe1cd05..e669fc4485e6 100644
--- a/drivers/staging/wfx/data_tx.c
+++ b/drivers/staging/wfx/data_tx.c
@@ -292,7 +292,6 @@ static int wfx_alloc_link_id(struct wfx_vif *wvif, const u8 *mac)
entry->status = WFX_LINK_RESERVE;
ether_addr_copy(entry->mac, mac);
memset(&entry->buffered, 0, WFX_MAX_TID);
- skb_queue_head_init(&entry->rx_queue);
wfx_tx_lock(wvif->wdev);
if (!schedule_work(&wvif->link_id_work))
@@ -400,8 +399,6 @@ void wfx_link_id_gc_work(struct work_struct *work)
next_gc = min_t(unsigned long, next_gc, ttl);
}
}
- if (need_reset)
- skb_queue_purge(&wvif->link_id_db[i].rx_queue);
}
spin_unlock_bh(&wvif->ps_state_lock);
if (next_gc != -1)
diff --git a/drivers/staging/wfx/data_tx.h b/drivers/staging/wfx/data_tx.h
index 078d0cfc521a..54738c2e3eac 100644
--- a/drivers/staging/wfx/data_tx.h
+++ b/drivers/staging/wfx/data_tx.h
@@ -34,7 +34,6 @@ struct wfx_link_entry {
u8 mac[ETH_ALEN];
u8 old_mac[ETH_ALEN];
u8 buffered[WFX_MAX_TID];
- struct sk_buff_head rx_queue;
};
struct tx_policy {
diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index 6a43decd5ae6..4a44d72f0db1 100644
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -571,7 +571,6 @@ int wfx_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv;
struct wfx_sta_priv *sta_priv = (struct wfx_sta_priv *) &sta->drv_priv;
struct wfx_link_entry *entry;
- struct sk_buff *skb;
if (wvif->vif->type != NL80211_IFTYPE_AP)
return 0;
@@ -589,8 +588,6 @@ int wfx_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
IEEE80211_WMM_IE_STA_QOSINFO_AC_MASK)
wvif->sta_asleep_mask |= BIT(sta_priv->link_id);
entry->status = WFX_LINK_HARD;
- while ((skb = skb_dequeue(&entry->rx_queue)))
- ieee80211_rx_irqsafe(wdev->hw, skb);
spin_unlock_bh(&wvif->ps_state_lock);
return 0;
}
--
2.25.0
next prev parent reply other threads:[~2020-01-15 12:15 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 12:12 [PATCH 00/65] Simplify and improve the wfx driver Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 01/65] staging: wfx: revert unexpected change in debugfs output Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 02/65] staging: wfx: make hif_scan() usage clearer Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 03/65] staging: wfx: add missing PROBE_RESP_OFFLOAD feature Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 04/65] staging: wfx: send rate policies one by one Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 05/65] staging: wfx: simplify hif_set_tx_rate_retry_policy() usage Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 06/65] staging: wfx: simplify hif_set_output_power() usage Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 07/65] staging: wfx: simplify hif_set_rcpi_rssi_threshold() usage Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 08/65] staging: wfx: simplify hif_set_arp_ipv4_filter() usage Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 09/65] staging: wfx: simplify hif_start() usage Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 10/65] staging: wfx: use specialized structs for HIF arguments Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 11/65] staging: wfx: retrieve ampdu_density from sta->ht_cap Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 12/65] staging: wfx: retrieve greenfield mode from sta->ht_cap and bss_conf Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 13/65] staging: wfx: drop struct wfx_ht_info Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 14/65] staging: wfx: drop wdev->output_power Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 15/65] staging: wfx: simplify wfx_config() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 16/65] staging: wfx: rename wfx_upload_beacon() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 17/65] staging: wfx: simplify wfx_upload_ap_templates() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 18/65] staging: wfx: simplify wfx_update_beaconing() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 19/65] staging: wfx: fix __wfx_flush() when drop == false Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 20/65] staging: wfx: simplify wfx_flush() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 21/65] staging: wfx: simplify update of DTIM period Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 22/65] staging: wfx: drop wvif->dtim_period Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 23/65] staging: wfx: drop wvif->enable_beacon Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 24/65] staging: wfx: drop wvif->cqm_rssi_thold Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 25/65] staging: wfx: drop wvif->setbssparams_done Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 26/65] staging: wfx: drop wfx_set_cts_work() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 27/65] staging: wfx: SSID should be provided to hif_start() even if hidden Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 28/65] staging: wfx: simplify hif_update_ie() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 29/65] staging: wfx: simplify hif_join() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 30/65] staging: wfx: simplify hif_set_association_mode() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 31/65] staging: wfx: simplify hif_set_uc_mc_bc_condition() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 32/65] staging: wfx: simplify hif_mib_uc_mc_bc_data_frame_condition Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 33/65] staging: wfx: simplify hif_mib_set_data_filtering Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 34/65] staging: wfx: simplify hif_set_data_filtering() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 35/65] staging: wfx: simplify hif_set_mac_addr_condition() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 36/65] staging: wfx: simplify hif_set_config_data_filter() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 37/65] staging: wfx: simplify wfx_set_mcast_filter() Jérôme Pouiller
2020-01-15 12:12 ` [PATCH 38/65] staging: wfx: simplify wfx_update_filtering() Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 39/65] staging: wfx: simplify wfx_scan_complete() Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 40/65] staging: wfx: update power-save per interface Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 41/65] staging: wfx: with multiple vifs, force PS only if channels differs Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 42/65] staging: wfx: do not update uapsd if not necessary Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 43/65] staging: wfx: fix case where RTS threshold is 0 Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 44/65] staging: wfx: fix possible overflow on jiffies comparaison Jérôme Pouiller
2020-01-15 12:13 ` Jérôme Pouiller [this message]
2020-01-15 12:13 ` [PATCH 46/65] staging: wfx: relocate "buffered" information to sta_priv Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 47/65] staging: wfx: fix bss_loss Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 48/65] staging: wfx: fix RCU usage Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 49/65] staging: wfx: simplify wfx_set_tim_impl() Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 50/65] staging: wfx: simplify the link-id allocation Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 51/65] staging: wfx: check that no tx is pending before release sta Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 52/65] staging: wfx: replace wfx_tx_get_tid() with ieee80211_get_tid() Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 53/65] staging: wfx: pspoll_mask make no sense Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 54/65] staging: wfx: sta and dtim Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 55/65] staging: wfx: firmware never return PS status for stations Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 56/65] staging: wfx: simplify wfx_suspend_resume_mc() Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 57/65] staging: wfx: simplify handling of IEEE80211_TX_CTL_SEND_AFTER_DTIM Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 58/65] staging: wfx: simplify wfx_ps_notify_sta() Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 59/65] staging: wfx: ensure that packet_id is unique Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 60/65] staging: wfx: remove unused do_probe Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 61/65] staging: wfx: remove check for interface state Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 62/65] staging: wfx: simplify hif_handle_tx_data() Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 63/65] staging: wfx: simplify wfx_tx_queue_get_num_queued() Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 64/65] staging: wfx: simplify hif_multi_tx_confirm() Jérôme Pouiller
2020-01-15 12:13 ` [PATCH 65/65] staging: wfx: update TODO Jérôme Pouiller
2020-01-15 13:40 ` [PATCH 00/65] Simplify and improve the wfx driver Greg Kroah-Hartman
2020-01-15 13:50 ` Jérôme Pouiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200115121041.10863-46-Jerome.Pouiller@silabs.com \
--to=jerome.pouiller@silabs.com \
--cc=davem@davemloft.net \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).