Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

This commit is contained in:
John W. Linville
2012-11-21 14:43:51 -05:00
43 changed files with 497 additions and 158 deletions

View File

@@ -131,6 +131,8 @@
#define IEEE80211_MAX_MESH_ID_LEN 32
#define IEEE80211_NUM_TIDS 16
#define IEEE80211_QOS_CTL_LEN 2
/* 1d tag mask */
#define IEEE80211_QOS_CTL_TAG1D_MASK 0x0007