From: Johannes Berg <johannes.berg@xxxxxxxxx>
We don't really want/need to maintain the old
station flags API any more, so refuse changes
to new (not yet defined) flags from the old
flags API.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
---
include/linux/nl80211.h | 2 ++
net/wireless/nl80211.c | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
--- a/include/linux/nl80211.h 2012-04-06 19:03:06.000000000 +0200
+++ b/include/linux/nl80211.h 2012-04-06 19:03:09.000000000 +0200
@@ -1587,6 +1587,8 @@ enum nl80211_sta_flags {
NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1
};
+#define NL80211_STA_FLAG_MAX_OLD_API NL80211_STA_FLAG_TDLS_PEER
+
/**
* struct nl80211_sta_flag_update - station flags mask/set
* @mask: mask of station flags to set
--- a/net/wireless/nl80211.c 2012-04-06 19:03:06.000000000 +0200
+++ b/net/wireless/nl80211.c 2012-04-06 19:03:09.000000000 +0200
@@ -2357,10 +2357,16 @@ static int parse_station_flags(struct ge
return -EINVAL;
}
- for (flag = 1; flag <= NL80211_STA_FLAG_MAX; flag++)
- if (flags[flag])
+ for (flag = 1; flag <= NL80211_STA_FLAG_MAX; flag++) {
+ if (flags[flag]) {
params->sta_flags_set |= (1<<flag);
+ /* no longer support new API additions in old API */
+ if (flag > NL80211_STA_FLAG_MAX_OLD_API)
+ return -EINVAL;
+ }
+ }
+
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
