diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-23 18:50:05 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-23 18:50:05 +0300 |
| commit | 419fc888e5396968620bb8f85beb7ab55293f04f (patch) | |
| tree | c44c932e7c2e04b831302b8cacae9b7679ec8161 /include | |
| parent | d7db318651d5430eb79eceef1e6aa9b084ae78e6 (diff) | |
| parent | fed4825096cfbbfd654cb292ab6eb193911aef01 (diff) | |
| download | linux-419fc888e5396968620bb8f85beb7ab55293f04f.tar.xz | |
Merge tag 'mac80211-for-davem-2018-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A handful of fixes:
* hwsim radio dump wasn't working for the first radio
* mesh was updating statistics incorrectly
* a netlink message allocation was possibly too short
* wiphy name limit was still too long
* in certain cases regdb query could find a NULL pointer
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/nl80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 9c3630146cec..271b93783d28 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -2698,7 +2698,7 @@ 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_WIPHY_NAME_MAXLEN 64 #define NL80211_MAX_SUPP_RATES 32 #define NL80211_MAX_SUPP_HT_RATES 77 |