Commit 305f7109 authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman

staging: wfx: simplify wfx_upload_ap_templates()

This function built probe response from data retrieved in beacon. Yet,
this job can be done with ieee80211_proberesp_get(). So, we can simplify
that code (and fix bugs like inclusion of TIM in probe responses).
Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200115135338.14374-18-Jerome.Pouiller@silabs.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d8a92d91
...@@ -783,7 +783,6 @@ static int wfx_update_beaconing(struct wfx_vif *wvif) ...@@ -783,7 +783,6 @@ static int wfx_update_beaconing(struct wfx_vif *wvif)
static int wfx_upload_ap_templates(struct wfx_vif *wvif) static int wfx_upload_ap_templates(struct wfx_vif *wvif)
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct ieee80211_mgmt *mgmt;
if (wvif->vif->type == NL80211_IFTYPE_STATION || if (wvif->vif->type == NL80211_IFTYPE_STATION ||
wvif->vif->type == NL80211_IFTYPE_MONITOR || wvif->vif->type == NL80211_IFTYPE_MONITOR ||
...@@ -795,14 +794,11 @@ static int wfx_upload_ap_templates(struct wfx_vif *wvif) ...@@ -795,14 +794,11 @@ static int wfx_upload_ap_templates(struct wfx_vif *wvif)
return -ENOMEM; return -ENOMEM;
hif_set_template_frame(wvif, skb, HIF_TMPLT_BCN, hif_set_template_frame(wvif, skb, HIF_TMPLT_BCN,
API_RATE_INDEX_B_1MBPS); API_RATE_INDEX_B_1MBPS);
dev_kfree_skb(skb);
/* TODO: Distill probe resp; remove TIM and any other beacon-specific skb = ieee80211_proberesp_get(wvif->wdev->hw, wvif->vif);
* IEs if (!skb)
*/ return -ENOMEM;
mgmt = (void *)skb->data;
mgmt->frame_control =
cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_RESP);
hif_set_template_frame(wvif, skb, HIF_TMPLT_PRBRES, hif_set_template_frame(wvif, skb, HIF_TMPLT_PRBRES,
API_RATE_INDEX_B_1MBPS); API_RATE_INDEX_B_1MBPS);
dev_kfree_skb(skb); dev_kfree_skb(skb);
......
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