aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-05-10 17:34:50 -0400
committerDavid S. Miller <davem@davemloft.net>2018-05-10 17:34:50 -0400
commitb2a9643855c320353723a08b9ee4a3bbd0301c1a (patch)
tree61cacf2ff831c2eb1cb6b28686a8864540b7c86d /include/uapi
parenttipc: fix one byte leak in tipc_sk_set_orig_addr() (diff)
parentmac80211: use timeout from the AddBA response instead of the request (diff)
downloadlinux-dev-b2a9643855c320353723a08b9ee4a3bbd0301c1a.tar.xz
linux-dev-b2a9643855c320353723a08b9ee4a3bbd0301c1a.zip
Merge tag 'mac80211-for-davem-2018-05-09' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says: ==================== We only have a few fixes this time: * WMM element validation * SAE timeout * add-BA timeout * docbook parsing * a few memory leaks in error paths ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/nl80211.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 15daf5e2638d..9c3630146cec 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2698,6 +2698,8 @@ enum nl80211_attrs {
#define NL80211_ATTR_KEYS NL80211_ATTR_KEYS
#define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS
+#define NL80211_WIPHY_NAME_MAXLEN 128
+
#define NL80211_MAX_SUPP_RATES 32
#define NL80211_MAX_SUPP_HT_RATES 77
#define NL80211_MAX_SUPP_REG_RULES 64