diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-14 18:00:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-14 18:00:48 -0400 |
| commit | c597f6653d5734c11b1e3217c7619a37e96e5a1f (patch) | |
| tree | 2c24b46bbe265f3284dcec0a001f7af498794964 /net/mac80211/sta_info.h | |
| parent | 669d67bf777def468970f2dcba1537edf3b2d329 (diff) | |
| parent | 341352d13dae752610342923c53ebe461624ee2c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'net/mac80211/sta_info.h')
| -rw-r--r-- | net/mac80211/sta_info.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index e920b229fb8..3bb24a121c9 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -362,6 +362,7 @@ struct sta_info { struct timer_list plink_timer; s64 t_offset; s64 t_offset_setpoint; + enum nl80211_channel_type ch_type; #endif #ifdef CONFIG_MAC80211_DEBUGFS |