diff options
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 7ceed99..cc6035f 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -829,15 +829,6 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info) * @RX_FLAG_STBC_MASK: STBC 2 bit bitmask. 1 - Nss=1, 2 - Nss=2, 3 - Nss=3 * @RX_FLAG_10MHZ: 10 MHz (half channel) was used * @RX_FLAG_5MHZ: 5 MHz (quarter channel) was used - * @RX_FLAG_AMSDU_MORE: Some drivers may prefer to report separate A-MSDU - * subframes instead of a one huge frame for performance reasons. - * All, but the last MSDU from an A-MSDU should have this flag set. E.g. - * if an A-MSDU has 3 frames, the first 2 must have the flag set, while - * the 3rd (last) one must not have this flag set. The flag is used to - * deal with retransmission/duplication recovery properly since A-MSDU - * subframes share the same sequence number. Reported subframes can be - * either regular MSDU or singly A-MSDUs. Subframes must not be - * interleaved with other frames. */ enum mac80211_rx_flags { RX_FLAG_MMIC_ERROR = BIT(0), @@ -868,7 +859,6 @@ enum mac80211_rx_flags { RX_FLAG_STBC_MASK = BIT(26) | BIT(27), RX_FLAG_10MHZ = BIT(28), RX_FLAG_5MHZ = BIT(29), - RX_FLAG_AMSDU_MORE = BIT(30), }; #define RX_FLAG_STBC_SHIFT 26 @@ -1502,15 +1492,6 @@ struct ieee80211_tx_control { * * @IEEE80211_HW_TIMING_BEACON_ONLY: Use sync timing from beacon frames * only, to allow getting TBTT of a DTIM beacon. - * - * @IEEE80211_HW_SUPPORTS_HT_CCK_RATES: Hardware supports mixing HT/CCK rates - * and can cope with CCK rates in an aggregation session (e.g. by not - * using aggregation for such frames.) - * - * @IEEE80211_HW_CHANCTX_STA_CSA: Support 802.11h based channel-switch (CSA) - * for a single active channel while using channel contexts. When support - * is not enabled the default action is to disconnect when getting the - * CSA frame. */ enum ieee80211_hw_flags { IEEE80211_HW_HAS_RATE_CONTROL = 1<<0, @@ -1541,7 +1522,6 @@ enum ieee80211_hw_flags { IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 1<<25, IEEE80211_HW_TIMING_BEACON_ONLY = 1<<26, IEEE80211_HW_SUPPORTS_HT_CCK_RATES = 1<<27, - IEEE80211_HW_CHANCTX_STA_CSA = 1<<28, }; /** @@ -2686,10 +2666,6 @@ enum ieee80211_roc_type { * zero using ieee80211_csa_is_complete() after the beacon has been * transmitted and then call ieee80211_csa_finish(). * - * @join_ibss: Join an IBSS (on an IBSS interface); this is called after all - * information in bss_conf is set up and the beacon can be retrieved. A - * channel context is bound before this is called. - * @leave_ibss: Leave the IBSS again. */ struct ieee80211_ops { void (*tx)(struct ieee80211_hw *hw, @@ -2881,9 +2857,6 @@ struct ieee80211_ops { void (*channel_switch_beacon)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct cfg80211_chan_def *chandef); - - int (*join_ibss)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); - void (*leave_ibss)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); }; /** @@ -3947,25 +3920,6 @@ void ieee80211_iterate_active_interfaces_atomic(struct ieee80211_hw *hw, void *data); /** - * ieee80211_iterate_active_interfaces_rtnl - iterate active interfaces - * - * This function iterates over the interfaces associated with a given - * hardware that are currently active and calls the callback for them. - * This version can only be used while holding the RTNL. - * - * @hw: the hardware struct of which the interfaces should be iterated over - * @iter_flags: iteration flags, see &enum ieee80211_interface_iteration_flags - * @iterator: the iterator function to call, cannot sleep - * @data: first argument of the iterator function - */ -void ieee80211_iterate_active_interfaces_rtnl(struct ieee80211_hw *hw, - u32 iter_flags, - void (*iterator)(void *data, - u8 *mac, - struct ieee80211_vif *vif), - void *data); - -/** * ieee80211_queue_work - add work onto the mac80211 workqueue * * Drivers and mac80211 use this to add work onto the mac80211 workqueue. @@ -4571,18 +4525,4 @@ void ieee80211_report_wowlan_wakeup(struct ieee80211_vif *vif, struct cfg80211_wowlan_wakeup *wakeup, gfp_t gfp); -/** - * ieee80211_tx_prepare_skb - prepare an 802.11 skb for transmission - * @hw: pointer as obtained from ieee80211_alloc_hw() - * @vif: virtual interface - * @skb: frame to be sent from within the driver - * @band: the band to transmit on - * @sta: optional pointer to get the station to send the frame to - * - * Note: must be called under RCU lock - */ -bool ieee80211_tx_prepare_skb(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, struct sk_buff *skb, - int band, struct ieee80211_sta **sta); - #endif /* MAC80211_H */ |