diff options
| author | John W. Linville | 2013-12-06 15:50:45 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-12-06 15:50:45 +0100 |
| commit | e08fd975bf26aa8063cadd245817e042f570472d (patch) | |
| tree | 2b2a705710e6374cc037f89bcc7bfc25047485ba /net/mac80211/ieee80211_i.h | |
| parent | ath: fix dynamic user regulatory domain support (diff) | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff) | |
| download | kernel-qcow2-linux-e08fd975bf26aa8063cadd245817e042f570472d.tar.gz kernel-qcow2-linux-e08fd975bf26aa8063cadd245817e042f570472d.tar.xz kernel-qcow2-linux-e08fd975bf26aa8063cadd245817e042f570472d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/Kconfig
net/mac80211/util.c
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 32bae218d6e5..ed5bf8b4b5c2 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1256,6 +1256,7 @@ struct ieee80211_csa_ie { u8 mode; u8 count; u8 ttl; + u16 pre_value; }; /* Parsed Information Elements */ |