Merge tag 'mac80211-next-for-davem-2018-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says: ==================== Highlights: * merge net-next, so I can finish the hwsim workqueue removal * fix TXQ NULL pointer issue that was reported multiple times * minstrel cleanups from Felix * simplify lib80211 code by not using skcipher, note that this will conflict with the crypto tree (and this new code here should be used) * use new netlink policy validation in nl80211 * fix up SAE (part of WPA3) in client-mode * FTM responder support in the stack ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
@@ -775,6 +775,12 @@ struct cfg80211_crypto_settings {
|
||||
* @assocresp_ies_len: length of assocresp_ies in octets
|
||||
* @probe_resp_len: length of probe response template (@probe_resp)
|
||||
* @probe_resp: probe response template (AP mode only)
|
||||
* @ftm_responder: enable FTM responder functionality; -1 for no change
|
||||
* (which also implies no change in LCI/civic location data)
|
||||
* @lci: LCI subelement content
|
||||
* @civicloc: Civic location subelement content
|
||||
* @lci_len: LCI data length
|
||||
* @civicloc_len: Civic location data length
|
||||
*/
|
||||
struct cfg80211_beacon_data {
|
||||
const u8 *head, *tail;
|
||||
@@ -782,12 +788,17 @@ struct cfg80211_beacon_data {
|
||||
const u8 *proberesp_ies;
|
||||
const u8 *assocresp_ies;
|
||||
const u8 *probe_resp;
|
||||
const u8 *lci;
|
||||
const u8 *civicloc;
|
||||
s8 ftm_responder;
|
||||
|
||||
size_t head_len, tail_len;
|
||||
size_t beacon_ies_len;
|
||||
size_t proberesp_ies_len;
|
||||
size_t assocresp_ies_len;
|
||||
size_t probe_resp_len;
|
||||
size_t lci_len;
|
||||
size_t civicloc_len;
|
||||
};
|
||||
|
||||
struct mac_address {
|
||||
@@ -1292,6 +1303,10 @@ struct cfg80211_tid_stats {
|
||||
* @ack_signal: signal strength (in dBm) of the last ACK frame.
|
||||
* @avg_ack_signal: average rssi value of ack packet for the no of msdu's has
|
||||
* been sent.
|
||||
* @rx_mpdu_count: number of MPDUs received from this station
|
||||
* @fcs_err_count: number of packets (MPDUs) received from this station with
|
||||
* an FCS error. This counter should be incremented only when TA of the
|
||||
* received packet with an FCS error matches the peer MAC address.
|
||||
*/
|
||||
struct station_info {
|
||||
u64 filled;
|
||||
@@ -1338,6 +1353,9 @@ struct station_info {
|
||||
struct cfg80211_tid_stats *pertid;
|
||||
s8 ack_signal;
|
||||
s8 avg_ack_signal;
|
||||
|
||||
u32 rx_mpdu_count;
|
||||
u32 fcs_err_count;
|
||||
};
|
||||
|
||||
#if IS_ENABLED(CONFIG_CFG80211)
|
||||
@@ -2796,6 +2814,40 @@ struct cfg80211_external_auth_params {
|
||||
u16 status;
|
||||
};
|
||||
|
||||
/**
|
||||
* cfg80211_ftm_responder_stats - FTM responder statistics
|
||||
*
|
||||
* @filled: bitflag of flags using the bits of &enum nl80211_ftm_stats to
|
||||
* indicate the relevant values in this struct for them
|
||||
* @success_num: number of FTM sessions in which all frames were successfully
|
||||
* answered
|
||||
* @partial_num: number of FTM sessions in which part of frames were
|
||||
* successfully answered
|
||||
* @failed_num: number of failed FTM sessions
|
||||
* @asap_num: number of ASAP FTM sessions
|
||||
* @non_asap_num: number of non-ASAP FTM sessions
|
||||
* @total_duration_ms: total sessions durations - gives an indication
|
||||
* of how much time the responder was busy
|
||||
* @unknown_triggers_num: number of unknown FTM triggers - triggers from
|
||||
* initiators that didn't finish successfully the negotiation phase with
|
||||
* the responder
|
||||
* @reschedule_requests_num: number of FTM reschedule requests - initiator asks
|
||||
* for a new scheduling although it already has scheduled FTM slot
|
||||
* @out_of_window_triggers_num: total FTM triggers out of scheduled window
|
||||
*/
|
||||
struct cfg80211_ftm_responder_stats {
|
||||
u32 filled;
|
||||
u32 success_num;
|
||||
u32 partial_num;
|
||||
u32 failed_num;
|
||||
u32 asap_num;
|
||||
u32 non_asap_num;
|
||||
u64 total_duration_ms;
|
||||
u32 unknown_triggers_num;
|
||||
u32 reschedule_requests_num;
|
||||
u32 out_of_window_triggers_num;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct cfg80211_ops - backend description for wireless configuration
|
||||
*
|
||||
@@ -3128,6 +3180,9 @@ struct cfg80211_external_auth_params {
|
||||
*
|
||||
* @tx_control_port: TX a control port frame (EAPoL). The noencrypt parameter
|
||||
* tells the driver that the frame should not be encrypted.
|
||||
*
|
||||
* @get_ftm_responder_stats: Retrieve FTM responder statistics, if available.
|
||||
* Statistics should be cumulative, currently no way to reset is provided.
|
||||
*/
|
||||
struct cfg80211_ops {
|
||||
int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
|
||||
@@ -3433,6 +3488,10 @@ struct cfg80211_ops {
|
||||
const u8 *buf, size_t len,
|
||||
const u8 *dest, const __be16 proto,
|
||||
const bool noencrypt);
|
||||
|
||||
int (*get_ftm_responder_stats)(struct wiphy *wiphy,
|
||||
struct net_device *dev,
|
||||
struct cfg80211_ftm_responder_stats *ftm_stats);
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -3960,7 +4019,6 @@ struct wiphy_iftype_ext_capab {
|
||||
* by the driver in the .connect() callback. The bit position maps to the
|
||||
* attribute indices defined in &enum nl80211_bss_select_attr.
|
||||
*
|
||||
* @cookie_counter: unique generic cookie counter, used to identify objects.
|
||||
* @nan_supported_bands: bands supported by the device in NAN mode, a
|
||||
* bitmap of &enum nl80211_band values. For instance, for
|
||||
* NL80211_BAND_2GHZ, bit 0 would be set
|
||||
@@ -4099,8 +4157,6 @@ struct wiphy {
|
||||
|
||||
u32 bss_select_support;
|
||||
|
||||
u64 cookie_counter;
|
||||
|
||||
u8 nan_supported_bands;
|
||||
|
||||
u32 txq_limit;
|
||||
|
||||
@@ -309,6 +309,8 @@ struct ieee80211_vif_chanctx_switch {
|
||||
* @BSS_CHANGED_KEEP_ALIVE: keep alive options (idle period or protected
|
||||
* keep alive) changed.
|
||||
* @BSS_CHANGED_MCAST_RATE: Multicast Rate setting changed for this interface
|
||||
* @BSS_CHANGED_FTM_RESPONDER: fime timing reasurement request responder
|
||||
* functionality changed for this BSS (AP mode).
|
||||
*
|
||||
*/
|
||||
enum ieee80211_bss_change {
|
||||
@@ -338,6 +340,7 @@ enum ieee80211_bss_change {
|
||||
BSS_CHANGED_MU_GROUPS = 1<<23,
|
||||
BSS_CHANGED_KEEP_ALIVE = 1<<24,
|
||||
BSS_CHANGED_MCAST_RATE = 1<<25,
|
||||
BSS_CHANGED_FTM_RESPONDER = 1<<26,
|
||||
|
||||
/* when adding here, make sure to change ieee80211_reconfig */
|
||||
};
|
||||
@@ -463,6 +466,21 @@ struct ieee80211_mu_group_data {
|
||||
u8 position[WLAN_USER_POSITION_LEN];
|
||||
};
|
||||
|
||||
/**
|
||||
* ieee80211_ftm_responder_params - FTM responder parameters
|
||||
*
|
||||
* @lci: LCI subelement content
|
||||
* @civicloc: CIVIC location subelement content
|
||||
* @lci_len: LCI data length
|
||||
* @civicloc_len: Civic data length
|
||||
*/
|
||||
struct ieee80211_ftm_responder_params {
|
||||
const u8 *lci;
|
||||
const u8 *civicloc;
|
||||
size_t lci_len;
|
||||
size_t civicloc_len;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ieee80211_bss_conf - holds the BSS's changing parameters
|
||||
*
|
||||
@@ -562,6 +580,9 @@ struct ieee80211_mu_group_data {
|
||||
* @protected_keep_alive: if set, indicates that the station should send an RSN
|
||||
* protected frame to the AP to reset the idle timer at the AP for the
|
||||
* station.
|
||||
* @ftm_responder: whether to enable or disable fine timing measurement FTM
|
||||
* responder functionality.
|
||||
* @ftmr_params: configurable lci/civic parameter when enabling FTM responder.
|
||||
*/
|
||||
struct ieee80211_bss_conf {
|
||||
const u8 *bssid;
|
||||
@@ -612,6 +633,8 @@ struct ieee80211_bss_conf {
|
||||
bool allow_p2p_go_ps;
|
||||
u16 max_idle_period;
|
||||
bool protected_keep_alive;
|
||||
bool ftm_responder;
|
||||
struct ieee80211_ftm_responder_params *ftmr_params;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -3598,6 +3621,8 @@ enum ieee80211_reconfig_type {
|
||||
* aggregating two specific frames in the same A-MSDU. The relation
|
||||
* between the skbs should be symmetric and transitive. Note that while
|
||||
* skb is always a real frame, head may or may not be an A-MSDU.
|
||||
* @get_ftm_responder_stats: Retrieve FTM responder statistics, if available.
|
||||
* Statistics should be cumulative, currently no way to reset is provided.
|
||||
*/
|
||||
struct ieee80211_ops {
|
||||
void (*tx)(struct ieee80211_hw *hw,
|
||||
@@ -3883,6 +3908,9 @@ struct ieee80211_ops {
|
||||
bool (*can_aggregate_in_amsdu)(struct ieee80211_hw *hw,
|
||||
struct sk_buff *head,
|
||||
struct sk_buff *skb);
|
||||
int (*get_ftm_responder_stats)(struct ieee80211_hw *hw,
|
||||
struct ieee80211_vif *vif,
|
||||
struct cfg80211_ftm_responder_stats *ftm_stats);
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -4351,6 +4379,21 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif,
|
||||
void ieee80211_sta_set_expected_throughput(struct ieee80211_sta *pubsta,
|
||||
u32 thr);
|
||||
|
||||
/**
|
||||
* ieee80211_tx_rate_update - transmit rate update callback
|
||||
*
|
||||
* Drivers should call this functions with a non-NULL pub sta
|
||||
* This function can be used in drivers that does not have provision
|
||||
* in updating the tx rate in data path.
|
||||
*
|
||||
* @hw: the hardware the frame was transmitted by
|
||||
* @pubsta: the station to update the tx rate for.
|
||||
* @info: tx status information
|
||||
*/
|
||||
void ieee80211_tx_rate_update(struct ieee80211_hw *hw,
|
||||
struct ieee80211_sta *pubsta,
|
||||
struct ieee80211_tx_info *info);
|
||||
|
||||
/**
|
||||
* ieee80211_tx_status - transmit status callback
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user