diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-14 13:53:49 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-14 13:53:49 -0400 |
| commit | 9316f0e3c6ba524d8fa14bfded048b252891931a (patch) | |
| tree | 60326e5943997bb72aaf2a375f8a20c61ec7bbcd /include/net/cfg80211.h | |
| parent | 7f2e6a5d8608d0353b017a0fe15502307593734e (diff) | |
| parent | 7a5f799becc51c842ec1a3aeb8dd82651aea7036 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'include/net/cfg80211.h')
| -rw-r--r-- | include/net/cfg80211.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 7b3b0568d289..a9a2be78e73c 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
| @@ -245,6 +245,7 @@ struct ieee80211_sta_vht_cap { | |||
| 245 | * rates" IE, i.e. CCK rates first, then OFDM. | 245 | * rates" IE, i.e. CCK rates first, then OFDM. |
| 246 | * @n_bitrates: Number of bitrates in @bitrates | 246 | * @n_bitrates: Number of bitrates in @bitrates |
| 247 | * @ht_cap: HT capabilities in this band | 247 | * @ht_cap: HT capabilities in this band |
| 248 | * @vht_cap: VHT capabilities in this band | ||
| 248 | */ | 249 | */ |
| 249 | struct ieee80211_supported_band { | 250 | struct ieee80211_supported_band { |
| 250 | struct ieee80211_channel *channels; | 251 | struct ieee80211_channel *channels; |