On Fri, Sep 07, 2012 at 01:18:09 +0200, Johannes Berg wrote: > On Fri, 2012-09-07 at 11:50 +0200, Nicolas Cavallari wrote: > > On 07/09/2012 10:25, Johannes Berg wrote: > > > On Thu, 2012-09-06 at 19:07 +0200, Antonio Quartulli wrote: > > > > > >> - if (!(ifmgd->flags & IEEE80211_STA_MFP_ENABLED)) > > >> - IEEE80211_SKB_CB(skb)->flags |= > > >> - IEEE80211_TX_INTFL_DONT_ENCRYPT; > > > > > > > > >> + if (sdata->vif.type == NL80211_IFTYPE_STATION && > > >> + !(sdata->u.mgd.flags & IEEE80211_STA_MFP_ENABLED)) > > >> + IEEE80211_SKB_CB(skb)->flags |= > > >> + IEEE80211_TX_INTFL_DONT_ENCRYPT; > > > > > > It would seem that this should be > > > > > > if (sdata->vif.type != NL80211_IFTYPE_STATION || > > > !(flags & MFP_ENABLED)) > > > > > > ? > > > > Or just never set TX_INTFL_DONT_ENCRYPT at all and rely on > > ieee80211_tx_h_select_key() to do the right thing ? > > I don't think it can do the right thing, it doesn't check whether MFP is > enabled or not... unless you want to test all those cases I'd rather not > change it :) Ok, then I will send v3 with the modified if-condition. Thank you all, -- Antonio Quartulli ..each of us alone is worth nothing.. Ernesto "Che" Guevara
Attachment:
pgpuBmWd7FXJJ.pgp
Description: PGP signature
