aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-02-18 15:27:42 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-02-18 15:27:42 -0500
commita9908ebf5ceb044eee6d9fda018d33cbf27df719 (patch)
tree281c858c19ba5e099e9a1eed84fa67dcfb2628f4 /net/mac80211/sta_info.h
parentiwlwifi: dvm: improve (again) the prints in reclaim path (diff)
parentcfg80211: fix station change if TDLS isn't supported (diff)
downloadlinux-dev-a9908ebf5ceb044eee6d9fda018d33cbf27df719.tar.xz
linux-dev-a9908ebf5ceb044eee6d9fda018d33cbf27df719.zip
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/sta_info.h')
-rw-r--r--net/mac80211/sta_info.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 63dfdb5e91da..4947341a2a82 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -285,7 +285,6 @@ struct sta_ampdu_mlme {
* @t_offset: timing offset relative to this host
* @t_offset_setpoint: reference timing offset of this sta to be used when
* calculating clockdrift
- * @ch_width: peer's channel width
* @local_pm: local link-specific power save mode
* @peer_pm: peer-specific power save mode towards local STA
* @nonpeer_pm: STA power save mode towards non-peer neighbors
@@ -386,7 +385,6 @@ struct sta_info {
struct timer_list plink_timer;
s64 t_offset;
s64 t_offset_setpoint;
- enum nl80211_chan_width ch_width;
/* mesh power save */
enum nl80211_mesh_power_mode local_pm;
enum nl80211_mesh_power_mode peer_pm;