On Wed, 2009-01-07 at 18:33 +0200, Jouni Malinen wrote: > How about following on top of the MFP patch series (and a small change > to ath9k to set this flag)? Looks good to me. > PS. > > Actually, NM would probably not need to care about MFP at all (unless > user wants to require it). I think I will change wpa_supplicant default > to MFP-optional once 802.11w gets deployed and is found not to cause > problems. True. Except that there probably will be problems unless everybody implements it perfectly... > --- > include/net/mac80211.h | 4 ++++ > net/mac80211/wext.c | 4 ++++ > 2 files changed, 8 insertions(+) > > --- wireless-testing.orig/include/net/mac80211.h 2009-01-07 18:10:40.000000000 +0200 > +++ wireless-testing/include/net/mac80211.h 2009-01-07 18:11:33.000000000 +0200 > @@ -866,6 +866,9 @@ enum ieee80211_tkip_key_type { > * Hardware which has dynamic power save support, meaning > * that power save is enabled in idle periods, and don't need support > * from stack. > + * > + * @IEEE80211_HW_MFP_CAPABLE: > + * Hardware supports management frame protection (MFP, IEEE 802.11w). > */ > enum ieee80211_hw_flags { > IEEE80211_HW_RX_INCLUDES_FCS = 1<<1, > @@ -879,6 +882,7 @@ enum ieee80211_hw_flags { > IEEE80211_HW_SPECTRUM_MGMT = 1<<9, > IEEE80211_HW_AMPDU_AGGREGATION = 1<<10, > IEEE80211_HW_NO_STACK_DYNAMIC_PS = 1<<11, > + IEEE80211_HW_MFP_CAPABLE = 1<<12, > }; > > /** > --- wireless-testing.orig/net/mac80211/wext.c 2009-01-07 18:20:30.000000000 +0200 > +++ wireless-testing/net/mac80211/wext.c 2009-01-07 18:22:38.000000000 +0200 > @@ -961,6 +961,10 @@ static int ieee80211_ioctl_siwauth(struc > ret = -EOPNOTSUPP; > break; > case IW_AUTH_MFP: > + if (!(sdata->local->hw.flags & IEEE80211_HW_MFP_CAPABLE)) { > + ret = -EOPNOTSUPP; > + break; > + } > if (sdata->vif.type == NL80211_IFTYPE_STATION || > sdata->vif.type == NL80211_IFTYPE_ADHOC) > sdata->u.sta.mfp = data->value; > >
Attachment:
signature.asc
Description: This is a digitally signed message part