This allows user space to determine whether a driver supports MFP and
behave properly without having to ask user to configure this in
MFP-optional mode.
Signed-off-by: Jouni Malinen <[email protected]>
---
include/net/mac80211.h | 4 ++++
net/mac80211/wext.c | 4 ++++
2 files changed, 8 insertions(+)
--- wireless-testing.orig/net/mac80211/wext.c 2009-01-08 13:06:36.000000000 +0200
+++ wireless-testing/net/mac80211/wext.c 2009-01-08 13:07:22.000000000 +0200
@@ -971,6 +971,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;
--- wireless-testing.orig/include/net/mac80211.h 2009-01-08 13:07:29.000000000 +0200
+++ wireless-testing/include/net/mac80211.h 2009-01-08 13:08:12.000000000 +0200
@@ -872,6 +872,9 @@ enum ieee80211_tkip_key_type {
*
* @IEEE80211_HW_SUPPORTS_DYNAMIC_PS:
* Hardware has support for dynamic PS.
+ *
+ * @IEEE80211_HW_MFP_CAPABLE:
+ * Hardware supports management frame protection (MFP, IEEE 802.11w).
*/
enum ieee80211_hw_flags {
IEEE80211_HW_RX_INCLUDES_FCS = 1<<1,
@@ -887,6 +890,7 @@ enum ieee80211_hw_flags {
IEEE80211_HW_SUPPORTS_PS = 1<<11,
IEEE80211_HW_PS_NULLFUNC_STACK = 1<<12,
IEEE80211_HW_SUPPORTS_DYNAMIC_PS = 1<<13,
+ IEEE80211_HW_MFP_CAPABLE = 1<<14,
};
/**
--
--
Jouni Malinen PGP id EFC895FA