summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2018-05-19 16:20:49 +0300
committerThomas Gleixner <tglx@linutronix.de>2018-05-19 16:20:49 +0300
commit95b5c0a592c712496dce6c1ed772d5f9026b5ed3 (patch)
treeef00485760be3388bafc2eed41da185fb8a4858a /include/uapi
parent985c78d3ff8e9c74450fa2bb08eb55e680d999ca (diff)
parent78ce241099bb363b19dbd0245442e66c8de8f567 (diff)
downloadlinux-95b5c0a592c712496dce6c1ed772d5f9026b5ed3.tar.xz
Merge branch 'ras/urgent' into ras/core
Pick up urgent fix as pending patch depends on it.
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