Patch "mac80211: use QoS NDP for AP probing" has been added to the 4.14-stable tree
Subsystems (5)
This is a note to let you know that I've just added the patch titled
mac80211: use QoS NDP for AP probing
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mac80211-use-qos-ndp-for-ap-probing.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Feb 1 13:45:42 CET 2018
From: Johannes Berg <[email protected]>
Date: Tue, 21 Nov 2017 14:46:08 +0100
Subject: mac80211: use QoS NDP for AP probing
From: Johannes Berg <[email protected]>
[ Upstream commit 7b6ddeaf27eca72795ceeae2f0f347db1b5f9a30 ]
When connected to a QoS/WMM AP, mac80211 should use a QoS NDP for probing it, instead of a regular non-QoS one, fix this.
Change all the drivers to *not* allow QoS NDP for now, even though it looks like most of them should be OK with that.
--- drivers/net/wireless/ath/ath9k/channel.c | 2 +- drivers/net/wireless/st/cw1200/sta.c | 4 ++-- drivers/net/wireless/ti/wl1251/main.c | 2 +- drivers/net/wireless/ti/wlcore/cmd.c | 5 +++-- include/net/mac80211.h | 8 +++++++- net/mac80211/mlme.c | 2 +- net/mac80211/tx.c | 29 +++++++++++++++++++++++++++-- 7 files changed, 42 insertions(+), 10 deletions(-)
drivers/net/wireless/ath/ath9k/channel.c +1 -1
@@ -1112,7 +1112,7 @@ ath_chanctx_send_vif_ps_frame(struct athif (!avp->assoc)return false; - skb =ieee80211_nullfunc_get (sc->hw, vif); + skb =ieee80211_nullfunc_get (sc->hw, vif, false);if (!skb)return false;
drivers/net/wireless/st/cw1200/sta.c +2 -2
@@ -198,7 +198,7 @@ void __cw1200_cqm_bssloss_sm(struct cw12 priv->bss_loss_state++; - skb =ieee80211_nullfunc_get (priv->hw, priv->vif); + skb =ieee80211_nullfunc_get (priv->hw, priv->vif, false);WARN_ON (!skb);if (skb)cw1200_tx (priv->hw,NULL , skb);
@@ -2266,7 +2266,7 @@ static int cw1200_upload_null(struct cw1 .rate = 0xFF, }; - frame.skb =ieee80211_nullfunc_get (priv->hw, priv->vif); + frame.skb =ieee80211_nullfunc_get (priv->hw, priv->vif, false);if (!frame.skb)return -ENOMEM ;
drivers/net/wireless/ti/wl1251/main.c +1 -1
@@ -566,7 +566,7 @@ static int wl1251_build_null_data(struct size =sizeof (struct wl12xx_null_data_template ); ptr =NULL ; }else { - skb =ieee80211_nullfunc_get (wl->hw, wl->vif); + skb =ieee80211_nullfunc_get (wl->hw, wl->vif, false);if (!skb) goto out; size = skb->len;
drivers/net/wireless/ti/wlcore/cmd.c +3 -2
@@ -1069,7 +1069,8 @@ int wl12xx_cmd_build_null_data(struct wl ptr =NULL ; }else { skb =ieee80211_nullfunc_get (wl->hw, -wl12xx_wlvif_to_vif (wlvif)); +wl12xx_wlvif_to_vif (wlvif), + false);if (!skb) goto out; size = skb->len;
@@ -1096,7 +1097,7 @@ int wl12xx_cmd_build_klv_null_data(strucstruct sk_buff *skb =NULL ;int ret = -ENOMEM ; - skb =ieee80211_nullfunc_get (wl->hw, vif); + skb =ieee80211_nullfunc_get (wl->hw, vif, false);if (!skb) goto out;
include/net/mac80211.h +7 -1
@@ -4470,18 +4470,24 @@ struct sk_buff *ieee80211_pspoll_get(str* ieee80211_nullfunc_get - retrieve a nullfunc template * @hw: pointer obtained from ieee80211_alloc_hw(). * @vif: &struct ieee80211_vif pointer from the add_interface callback. +* @qos_ok: QoS NDP is acceptable to the caller, this should be set +* if at all possible * * Creates a Nullfunc template which can, for example, uploaded to * hardware. The template must be updated after association so that correct * BSSID and address is used. * +* If @qos_ndp is set and the association is to an AP with QoS/WMM, the +* returned packet will be QoS NDP. +* * Note: Caller (or hardware) is responsible for setting the * &IEEE80211_FCTL_PM bit as well as Duration and Sequence Control fields. * * Return: The nullfunc template. %NULL on error. */ struct sk_buff *ieee80211_nullfunc_get (struct ieee80211_hw *hw, -struct ieee80211_vif *vif); +struct ieee80211_vif *vif, +bool qos_ok);/** * ieee80211_probereq_get - retrieve a Probe Request template
net/mac80211/mlme.c +1 -1
@@ -908,7 +908,7 @@ void ieee80211_send_nullfunc(struct ieeestruct ieee80211_hdr_3addr *nullfunc;struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; - skb =ieee80211_nullfunc_get (&local->hw, &sdata->vif); + skb =ieee80211_nullfunc_get (&local->hw, &sdata->vif, true);if (!skb)return ;
net/mac80211/tx.c +27 -2
@@ -4404,13 +4404,15 @@ struct sk_buff *ieee80211_pspoll_get(strEXPORT_SYMBOL (ieee80211_pspoll_get);struct sk_buff *ieee80211_nullfunc_get (struct ieee80211_hw *hw, -struct ieee80211_vif *vif) +struct ieee80211_vif *vif, +bool qos_ok) {struct ieee80211_hdr_3addr *nullfunc;struct ieee80211_sub_if_data *sdata;struct ieee80211_if_managed *ifmgd;struct ieee80211_local *local;struct sk_buff *skb; +bool qos = false;if (WARN_ON (vif->type !=NL80211_IFTYPE_STATION ))return NULL ;
@@ -4419,7 +4421,17 @@ struct sk_buff *ieee80211_nullfunc_get(s ifmgd = &sdata->u.mgd; local = sdata->local; - skb =dev_alloc_skb (local->hw.extra_tx_headroom +sizeof (*nullfunc)); +if (qos_ok) { +struct sta_info *sta; + +rcu_read_lock (); + sta =sta_info_get (sdata, ifmgd->bssid); + qos = sta && sta->sta.wme; +rcu_read_unlock (); + } + + skb =dev_alloc_skb (local->hw.extra_tx_headroom + +sizeof (*nullfunc) +2 );if (!skb)return NULL ;
@@ -4429,6 +4441,19 @@ struct sk_buff *ieee80211_nullfunc_get(s nullfunc->frame_control =cpu_to_le16 (IEEE80211_FTYPE_DATA |IEEE80211_STYPE_NULLFUNC |IEEE80211_FCTL_TODS ); +if (qos) { +__le16 qos =cpu_to_le16 (7 ); + +BUILD_BUG_ON ((IEEE80211_STYPE_QOS_NULLFUNC | +IEEE80211_STYPE_NULLFUNC ) != +IEEE80211_STYPE_QOS_NULLFUNC ); + nullfunc->frame_control |= +cpu_to_le16 (IEEE80211_STYPE_QOS_NULLFUNC ); + skb->priority =7 ; +skb_set_queue_mapping (skb,IEEE80211_AC_VO ); +skb_put_data (skb, &qos,sizeof (qos)); + } +memcpy (nullfunc->addr1, ifmgd->bssid,ETH_ALEN );memcpy (nullfunc->addr2, vif->addr,ETH_ALEN );memcpy (nullfunc->addr3, ifmgd->bssid,ETH_ALEN );
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/mac80211-fix-the-update-of-path-metric-for-rann-frame.patch queue-4.14/mac80211-use-qos-ndp-for-ap-probing.patch