diff options
| author | Mark Brown <broonie@kernel.org> | 2018-05-30 11:03:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-30 11:03:51 +0100 |
| commit | 031155013b5ac4b5a86f7c7d87ed4b379f62ff21 (patch) | |
| tree | 3127ba78a133c7b4a8e95261ad6aaeeb6ff0b40c /include/uapi/linux | |
| parent | 0e7fcfff8dc3b5f08f0bee84ce00d3234992e0d2 (diff) | |
| parent | 712a231848027a1728d90784cc1f7aec6c017abd (diff) | |
Merge tag 'v4.4.134' into linux-linaro-lsk-v4.4
This is the 4.4.134 stable release
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/if_ether.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/nl80211.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h index ea9221b0331a..064d2026ab38 100644 --- a/include/uapi/linux/if_ether.h +++ b/include/uapi/linux/if_ether.h @@ -29,6 +29,7 @@ */ #define ETH_ALEN 6 /* Octets in one ethernet addr */ +#define ETH_TLEN 2 /* Octets in ethernet type field */ #define ETH_HLEN 14 /* Total octets in header. */ #define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ #define ETH_DATA_LEN 1500 /* Max. octets in payload */ diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 1f0b4cf5dd03..f4227173b5d8 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -2195,6 +2195,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 |