diff options
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index cc6e964d9837..156ea79e0157 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -1168,8 +1168,6 @@ struct ieee80211_local { | |||
1168 | /* wowlan is enabled -- don't reconfig on resume */ | 1168 | /* wowlan is enabled -- don't reconfig on resume */ |
1169 | bool wowlan; | 1169 | bool wowlan; |
1170 | 1170 | ||
1171 | /* DFS/radar detection is enabled */ | ||
1172 | bool radar_detect_enabled; | ||
1173 | struct work_struct radar_detected_work; | 1171 | struct work_struct radar_detected_work; |
1174 | 1172 | ||
1175 | /* number of RX chains the hardware has */ | 1173 | /* number of RX chains the hardware has */ |
@@ -1704,6 +1702,7 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, | |||
1704 | struct ieee80211_supported_band *sband, | 1702 | struct ieee80211_supported_band *sband, |
1705 | const struct ieee80211_vht_cap *vht_cap_ie, | 1703 | const struct ieee80211_vht_cap *vht_cap_ie, |
1706 | struct sta_info *sta); | 1704 | struct sta_info *sta); |
1705 | enum ieee80211_sta_rx_bandwidth ieee80211_sta_cap_rx_bw(struct sta_info *sta); | ||
1707 | enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta); | 1706 | enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta); |
1708 | void ieee80211_sta_set_rx_nss(struct sta_info *sta); | 1707 | void ieee80211_sta_set_rx_nss(struct sta_info *sta); |
1709 | u32 __ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata, | 1708 | u32 __ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata, |
@@ -1881,10 +1880,10 @@ void ieee80211_add_pending_skb(struct ieee80211_local *local, | |||
1881 | void ieee80211_add_pending_skbs(struct ieee80211_local *local, | 1880 | void ieee80211_add_pending_skbs(struct ieee80211_local *local, |
1882 | struct sk_buff_head *skbs); | 1881 | struct sk_buff_head *skbs); |
1883 | void ieee80211_flush_queues(struct ieee80211_local *local, | 1882 | void ieee80211_flush_queues(struct ieee80211_local *local, |
1884 | struct ieee80211_sub_if_data *sdata); | 1883 | struct ieee80211_sub_if_data *sdata, bool drop); |
1885 | void __ieee80211_flush_queues(struct ieee80211_local *local, | 1884 | void __ieee80211_flush_queues(struct ieee80211_local *local, |
1886 | struct ieee80211_sub_if_data *sdata, | 1885 | struct ieee80211_sub_if_data *sdata, |
1887 | unsigned int queues); | 1886 | unsigned int queues, bool drop); |
1888 | 1887 | ||
1889 | void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, | 1888 | void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, |
1890 | u16 transaction, u16 auth_alg, u16 status, | 1889 | u16 transaction, u16 auth_alg, u16 status, |
@@ -1981,6 +1980,7 @@ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local, | |||
1981 | struct ieee80211_chanctx *chanctx); | 1980 | struct ieee80211_chanctx *chanctx); |
1982 | void ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local, | 1981 | void ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local, |
1983 | struct ieee80211_chanctx *ctx); | 1982 | struct ieee80211_chanctx *ctx); |
1983 | bool ieee80211_is_radar_required(struct ieee80211_local *local); | ||
1984 | 1984 | ||
1985 | void ieee80211_dfs_cac_timer(unsigned long data); | 1985 | void ieee80211_dfs_cac_timer(unsigned long data); |
1986 | void ieee80211_dfs_cac_timer_work(struct work_struct *work); | 1986 | void ieee80211_dfs_cac_timer_work(struct work_struct *work); |