* [PATCH] Revert "mac80211: remove exposing 'mfp' to drivers"
@ 2015-10-07 5:10 c_traja
2015-10-07 16:52 ` Peter Oh
2015-10-13 8:31 ` Johannes Berg
0 siblings, 2 replies; 4+ messages in thread
From: c_traja @ 2015-10-07 5:10 UTC (permalink / raw)
To: johannes, ath10k; +Cc: linux-wireless, Tamizh chelvam
From: Tamizh chelvam <c_traja@qti.qualcomm.com>
This reverts commit 5c48f1201744233d4f235c7dd916d5196ed20716.
Some device drivers (ath10k) offload part of aggregation including AddBA/DelBA
negotiations to firmware. In such scenario, the PMF configuration of
the station needs to be provided to driver to enable encryption of
AddBA/DelBA action frames.
Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com>
---
Notes:
> ath10k change using this mfp configuration will follow.
include/net/mac80211.h | 2 ++
net/mac80211/cfg.c | 1 +
net/mac80211/mlme.c | 6 +++++-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 4ec6fed..1bb2a2b 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1683,6 +1683,7 @@ struct ieee80211_sta_rates {
* @tdls: indicates whether the STA is a TDLS peer
* @tdls_initiator: indicates the STA is an initiator of the TDLS link. Only
* valid if the STA is a TDLS peer in the first place.
+ * @mfp: indicates whether the STA uses management frame protection or not.
* @txq: per-TID data TX queues (if driver uses the TXQ abstraction)
*/
struct ieee80211_sta {
@@ -1700,6 +1701,7 @@ struct ieee80211_sta {
struct ieee80211_sta_rates __rcu *rates;
bool tdls;
bool tdls_initiator;
+ bool mfp;
struct ieee80211_txq *txq[IEEE80211_NUM_TIDS];
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 68e551e..63d03da 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1138,6 +1138,7 @@ static int sta_apply_parameters(struct ieee80211_local *local,
}
if (mask & BIT(NL80211_STA_FLAG_MFP)) {
+ sta->sta.mfp = !!(set & BIT(NL80211_STA_FLAG_MFP));
if (set & BIT(NL80211_STA_FLAG_MFP))
set_sta_flag(sta, WLAN_STA_MFP);
else
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 56ef9a8..9c450ff 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3044,8 +3044,12 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
rate_control_rate_init(sta);
- if (ifmgd->flags & IEEE80211_STA_MFP_ENABLED)
+ if (ifmgd->flags & IEEE80211_STA_MFP_ENABLED) {
set_sta_flag(sta, WLAN_STA_MFP);
+ sta->sta.mfp = true;
+ } else {
+ sta->sta.mfp = false;
+ }
sta->sta.wme = elems.wmm_param && local->hw.queues >= IEEE80211_NUM_ACS;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Revert "mac80211: remove exposing 'mfp' to drivers"
2015-10-07 5:10 [PATCH] Revert "mac80211: remove exposing 'mfp' to drivers" c_traja
@ 2015-10-07 16:52 ` Peter Oh
2015-10-08 7:48 ` Johannes Berg
2015-10-13 8:31 ` Johannes Berg
1 sibling, 1 reply; 4+ messages in thread
From: Peter Oh @ 2015-10-07 16:52 UTC (permalink / raw)
To: c_traja, johannes, ath10k; +Cc: linux-wireless
On 10/06/2015 10:10 PM, c_traja@qti.qualcomm.com wrote:
> From: Tamizh chelvam <c_traja@qti.qualcomm.com>
>
> This reverts commit 5c48f1201744233d4f235c7dd916d5196ed20716.
>
> Some device drivers (ath10k) offload part of aggregation including
> AddBA/DelBA
> negotiations to firmware. In such scenario, the PMF
Is it typo of MFP or abbreviation of something else?
> configuration of
> the station needs to be provided to driver to enable encryption of
> AddBA/DelBA action frames.
>
> Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com>
> ---
> Notes:
> > ath10k change using this mfp configuration will follow.
>
> include/net/mac80211.h | 2 ++
> net/mac80211/cfg.c | 1 +
> net/mac80211/mlme.c | 6 +++++-
> 3 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/include/net/mac80211.h b/include/net/mac80211.h
> index 4ec6fed..1bb2a2b 100644
> --- a/include/net/mac80211.h
> +++ b/include/net/mac80211.h
> @@ -1683,6 +1683,7 @@ struct ieee80211_sta_rates {
> * @tdls: indicates whether the STA is a TDLS peer
> * @tdls_initiator: indicates the STA is an initiator of the TDLS link.
> Only
> * valid if the STA is a TDLS peer in the first place.
> + * @mfp: indicates whether the STA uses management frame protection or
> not.
> * @txq: per-TID data TX queues (if driver uses the TXQ abstraction)
> */
> struct ieee80211_sta {
> @@ -1700,6 +1701,7 @@ struct ieee80211_sta {
> struct ieee80211_sta_rates __rcu *rates;
> bool tdls;
> bool tdls_initiator;
> + bool mfp;
>
> struct ieee80211_txq *txq[IEEE80211_NUM_TIDS];
>
> diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
> index 68e551e..63d03da 100644
> --- a/net/mac80211/cfg.c
> +++ b/net/mac80211/cfg.c
> @@ -1138,6 +1138,7 @@ static int sta_apply_parameters(struct
> ieee80211_local *local,
> }
>
> if (mask & BIT(NL80211_STA_FLAG_MFP)) {
> + sta->sta.mfp = !!(set & BIT(NL80211_STA_FLAG_MFP));
> if (set & BIT(NL80211_STA_FLAG_MFP))
> set_sta_flag(sta, WLAN_STA_MFP);
> else
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> index 56ef9a8..9c450ff 100644
> --- a/net/mac80211/mlme.c
> +++ b/net/mac80211/mlme.c
> @@ -3044,8 +3044,12 @@ static bool ieee80211_assoc_success(struct
> ieee80211_sub_if_data *sdata,
>
> rate_control_rate_init(sta);
>
> - if (ifmgd->flags & IEEE80211_STA_MFP_ENABLED)
> + if (ifmgd->flags & IEEE80211_STA_MFP_ENABLED) {
> set_sta_flag(sta, WLAN_STA_MFP);
> + sta->sta.mfp = true;
> + } else {
> + sta->sta.mfp = false;
> + }
>
> sta->sta.wme = elems.wmm_param && local->hw.queues >=
> IEEE80211_NUM_ACS;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Revert "mac80211: remove exposing 'mfp' to drivers"
2015-10-07 16:52 ` Peter Oh
@ 2015-10-08 7:48 ` Johannes Berg
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Berg @ 2015-10-08 7:48 UTC (permalink / raw)
To: Peter Oh, c_traja, ath10k; +Cc: linux-wireless
On Wed, 2015-10-07 at 09:52 -0700, Peter Oh wrote:
> On 10/06/2015 10:10 PM, c_traja@qti.qualcomm.com wrote:
> > From: Tamizh chelvam <c_traja@qti.qualcomm.com>
> >
> > This reverts commit 5c48f1201744233d4f235c7dd916d5196ed20716.
> >
> > Some device drivers (ath10k) offload part of aggregation including
> > AddBA/DelBA
> > negotiations to firmware. In such scenario, the PMF
> Is it typo of MFP or abbreviation of something else?
Oh, it's just some acronym confusion...
MFP = management frame protection
PMF = protected management frames
(or so)
johannes
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Revert "mac80211: remove exposing 'mfp' to drivers"
2015-10-07 5:10 [PATCH] Revert "mac80211: remove exposing 'mfp' to drivers" c_traja
2015-10-07 16:52 ` Peter Oh
@ 2015-10-13 8:31 ` Johannes Berg
1 sibling, 0 replies; 4+ messages in thread
From: Johannes Berg @ 2015-10-13 8:31 UTC (permalink / raw)
To: c_traja, ath10k; +Cc: linux-wireless
On Wed, 2015-10-07 at 10:40 +0530, c_traja@qti.qualcomm.com wrote:
> From: Tamizh chelvam <c_traja@qti.qualcomm.com>
>
> This reverts commit 5c48f1201744233d4f235c7dd916d5196ed20716.
>
> Some device drivers (ath10k) offload part of aggregation including
> AddBA/DelBA
> negotiations to firmware. In such scenario, the PMF configuration of
> the station needs to be provided to driver to enable encryption of
> AddBA/DelBA action frames.
>
Applied.
johannes
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-10-13 8:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-07 5:10 [PATCH] Revert "mac80211: remove exposing 'mfp' to drivers" c_traja
2015-10-07 16:52 ` Peter Oh
2015-10-08 7:48 ` Johannes Berg
2015-10-13 8:31 ` Johannes Berg
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).