Merge tag 'mac80211-next-for-davem-2016-10-04' of... (1ebf8b42) · Commits · 戴 / test

include/net/cfg80211.h

+210 −13

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		*
		* Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
		* Copyright 2013-2014 Intel Mobile Communications GmbH
		* Copyright 2015 Intel Deutschland GmbH
		* Copyright 2015-2016 Intel Deutschland GmbH
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		@@ -593,6 +593,8 @@ struct survey_info {
		s8 noise;
		};

		#define CFG80211_MAX_WEP_KEYS 4

		/**
		* struct cfg80211_crypto_settings - Crypto settings
		* @wpa_versions: indicates which, if any, WPA versions are enabled
		@@ -610,6 +612,9 @@ struct survey_info {
		* allowed through even on unauthorized ports
		* @control_port_no_encrypt: TRUE to prevent encryption of control port
		* protocol frames.
		* @wep_keys: static WEP keys, if not NULL points to an array of
		* CFG80211_MAX_WEP_KEYS WEP keys
		* @wep_tx_key: key index (0..3) of the default TX static WEP key
		*/
		struct cfg80211_crypto_settings {
		u32 wpa_versions;
		@@ -621,6 +626,8 @@ struct cfg80211_crypto_settings {
		bool control_port;
		__be16 control_port_ethertype;
		bool control_port_no_encrypt;
		struct key_params *wep_keys;
		int wep_tx_key;
		};

		/**
		@@ -676,6 +683,18 @@ struct cfg80211_acl_data {
		struct mac_address mac_addrs[];
		};

		/*
		* cfg80211_bitrate_mask - masks for bitrate control
		*/
		struct cfg80211_bitrate_mask {
		struct {
		u32 legacy;
		u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN];
		u16 vht_mcs[NL80211_VHT_NSS_MAX];
		enum nl80211_txrate_gi gi;
		} control[NUM_NL80211_BANDS];
		};

		/**
		* struct cfg80211_ap_settings - AP configuration
		*
		@@ -700,6 +719,7 @@ struct cfg80211_acl_data {
		* MAC address based access control
		* @pbss: If set, start as a PCP instead of AP. Relevant for DMG
		* networks.
		* @beacon_rate: bitrate to be used for beacons
		*/
		struct cfg80211_ap_settings {
		struct cfg80211_chan_def chandef;
		@@ -719,6 +739,7 @@ struct cfg80211_ap_settings {
		bool p2p_opp_ps;
		const struct cfg80211_acl_data *acl;
		bool pbss;
		struct cfg80211_bitrate_mask beacon_rate;
		};

		/**
		@@ -1351,6 +1372,7 @@ struct mesh_config {
		* @beacon_interval: beacon interval to use
		* @mcast_rate: multicat rate for Mesh Node [6Mbps is the default for 802.11a]
		* @basic_rates: basic rates to use when creating the mesh
		* @beacon_rate: bitrate to be used for beacons
		*
		* These parameters are fixed when the mesh is created.
		*/
		@@ -1371,6 +1393,7 @@ struct mesh_setup {
		u16 beacon_interval;
		int mcast_rate[NUM_NL80211_BANDS];
		u32 basic_rates;
		struct cfg80211_bitrate_mask beacon_rate;
		};

		/**
		@@ -2010,17 +2033,6 @@ enum wiphy_params_flags {
		WIPHY_PARAM_DYN_ACK = 1 << 5,
		};

		/*
		* cfg80211_bitrate_mask - masks for bitrate control
		*/
		struct cfg80211_bitrate_mask {
		struct {
		u32 legacy;
		u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN];
		u16 vht_mcs[NL80211_VHT_NSS_MAX];
		enum nl80211_txrate_gi gi;
		} control[NUM_NL80211_BANDS];
		};
		/**
		* struct cfg80211_pmksa - PMK Security Association
		*
		@@ -2301,6 +2313,98 @@ struct cfg80211_qos_map {
		struct cfg80211_dscp_range up[8];
		};

		/**
		* struct cfg80211_nan_conf - NAN configuration
		*
		* This struct defines NAN configuration parameters
		*
		* @master_pref: master preference (1 - 255)
		* @dual: dual band operation mode, see &enum nl80211_nan_dual_band_conf
		*/
		struct cfg80211_nan_conf {
		u8 master_pref;
		u8 dual;
		};

		/**
		* enum cfg80211_nan_conf_changes - indicates changed fields in NAN
		* configuration
		*
		* @CFG80211_NAN_CONF_CHANGED_PREF: master preference
		* @CFG80211_NAN_CONF_CHANGED_DUAL: dual band operation
		*/
		enum cfg80211_nan_conf_changes {
		CFG80211_NAN_CONF_CHANGED_PREF = BIT(0),
		CFG80211_NAN_CONF_CHANGED_DUAL = BIT(1),
		};

		/**
		* struct cfg80211_nan_func_filter - a NAN function Rx / Tx filter
		*
		* @filter: the content of the filter
		* @len: the length of the filter
		*/
		struct cfg80211_nan_func_filter {
		const u8 *filter;
		u8 len;
		};

		/**
		* struct cfg80211_nan_func - a NAN function
		*
		* @type: &enum nl80211_nan_function_type
		* @service_id: the service ID of the function
		* @publish_type: &nl80211_nan_publish_type
		* @close_range: if true, the range should be limited. Threshold is
		* implementation specific.
		* @publish_bcast: if true, the solicited publish should be broadcasted
		* @subscribe_active: if true, the subscribe is active
		* @followup_id: the instance ID for follow up
		* @followup_reqid: the requestor instance ID for follow up
		* @followup_dest: MAC address of the recipient of the follow up
		* @ttl: time to live counter in DW.
		* @serv_spec_info: Service Specific Info
		* @serv_spec_info_len: Service Specific Info length
		* @srf_include: if true, SRF is inclusive
		* @srf_bf: Bloom Filter
		* @srf_bf_len: Bloom Filter length
		* @srf_bf_idx: Bloom Filter index
		* @srf_macs: SRF MAC addresses
		* @srf_num_macs: number of MAC addresses in SRF
		* @rx_filters: rx filters that are matched with corresponding peer's tx_filter
		* @tx_filters: filters that should be transmitted in the SDF.
		* @num_rx_filters: length of &rx_filters.
		* @num_tx_filters: length of &tx_filters.
		* @instance_id: driver allocated id of the function.
		* @cookie: unique NAN function identifier.
		*/
		struct cfg80211_nan_func {
		enum nl80211_nan_function_type type;
		u8 service_id[NL80211_NAN_FUNC_SERVICE_ID_LEN];
		u8 publish_type;
		bool close_range;
		bool publish_bcast;
		bool subscribe_active;
		u8 followup_id;
		u8 followup_reqid;
		struct mac_address followup_dest;
		u32 ttl;
		const u8 *serv_spec_info;
		u8 serv_spec_info_len;
		bool srf_include;
		const u8 *srf_bf;
		u8 srf_bf_len;
		u8 srf_bf_idx;
		struct mac_address *srf_macs;
		int srf_num_macs;
		struct cfg80211_nan_func_filter *rx_filters;
		struct cfg80211_nan_func_filter *tx_filters;
		u8 num_tx_filters;
		u8 num_rx_filters;
		u8 instance_id;
		u64 cookie;
		};

		/**
		* struct cfg80211_ops - backend description for wireless configuration
		*
		@@ -2589,6 +2693,19 @@ struct cfg80211_qos_map {
		* and returning to the base channel for communication with the AP.
		* @tdls_cancel_channel_switch: Stop channel-switching with a TDLS peer. Both
		* peers must be on the base channel when the call completes.
		* @start_nan: Start the NAN interface.
		* @stop_nan: Stop the NAN interface.
		* @add_nan_func: Add a NAN function. Returns negative value on failure.
		* On success @nan_func ownership is transferred to the driver and
		* it may access it outside of the scope of this function. The driver
		* should free the @nan_func when no longer needed by calling
		* cfg80211_free_nan_func().
		* On success the driver should assign an instance_id in the
		* provided @nan_func.
		* @del_nan_func: Delete a NAN function.
		* @nan_change_conf: changes NAN configuration. The changed parameters must
		* be specified in @changes (using &enum cfg80211_nan_conf_changes);
		* All other parameters must be ignored.
		*/
		struct cfg80211_ops {
		int (suspend)(struct wiphy wiphy, struct cfg80211_wowlan *wow);
		@@ -2854,6 +2971,17 @@ struct cfg80211_ops {
		void (tdls_cancel_channel_switch)(struct wiphy wiphy,
		struct net_device *dev,
		const u8 *addr);
		int (start_nan)(struct wiphy wiphy, struct wireless_dev *wdev,
		struct cfg80211_nan_conf *conf);
		void (stop_nan)(struct wiphy wiphy, struct wireless_dev *wdev);
		int (add_nan_func)(struct wiphy wiphy, struct wireless_dev *wdev,
		struct cfg80211_nan_func *nan_func);
		void (del_nan_func)(struct wiphy wiphy, struct wireless_dev *wdev,
		u64 cookie);
		int (nan_change_conf)(struct wiphy wiphy,
		struct wireless_dev *wdev,
		struct cfg80211_nan_conf *conf,
		u32 changes);
		};

		/*
		@@ -2900,6 +3028,8 @@ struct cfg80211_ops {
		* @WIPHY_FLAG_SUPPORTS_5_10_MHZ: Device supports 5 MHz and 10 MHz channels.
		* @WIPHY_FLAG_HAS_CHANNEL_SWITCH: Device supports channel switch in
		* beaconing mode (AP, IBSS, Mesh, ...).
		* @WIPHY_FLAG_HAS_STATIC_WEP: The device supports static WEP key installation
		* before connection.
		*/
		enum wiphy_flags {
		/* use hole at 0 */
		@@ -2925,6 +3055,7 @@ enum wiphy_flags {
		WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL = BIT(21),
		WIPHY_FLAG_SUPPORTS_5_10_MHZ = BIT(22),
		WIPHY_FLAG_HAS_CHANNEL_SWITCH = BIT(23),
		WIPHY_FLAG_HAS_STATIC_WEP = BIT(24),
		};

		/**
		@@ -3302,6 +3433,8 @@ struct wiphy_iftype_ext_capab {
		* @bss_select_support: bitmask indicating the BSS selection criteria supported
		* 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.
		*/
		struct wiphy {
		/* assign these fields before you register the wiphy */
		@@ -3431,6 +3564,8 @@ struct wiphy {

		u32 bss_select_support;

		u64 cookie_counter;

		char priv[0] __aligned(NETDEV_ALIGN);
		};

		@@ -3611,6 +3746,7 @@ struct cfg80211_cached_keys;
		* beacons, 0 when not valid
		* @address: The address for this device, valid only if @netdev is %NULL
		* @p2p_started: true if this is a P2P Device that has been started
		* @nan_started: true if this is a NAN interface that has been started
		* @cac_started: true if DFS channel availability check has been started
		* @cac_start_time: timestamp (jiffies) when the dfs state was entered.
		* @cac_time_ms: CAC time in ms
		@@ -3642,7 +3778,7 @@ struct wireless_dev {

		struct mutex mtx;

		bool use_4addr, p2p_started;
		bool use_4addr, p2p_started, nan_started;

		u8 address[ETH_ALEN] __aligned(sizeof(u16));

		@@ -5550,6 +5686,67 @@ wiphy_ext_feature_isset(struct wiphy *wiphy,
		return (ft_byte & BIT(ftidx % 8)) != 0;
		}

		/**
		* cfg80211_free_nan_func - free NAN function
		* @f: NAN function that should be freed
		*
		* Frees all the NAN function and all it's allocated members.
		*/
		void cfg80211_free_nan_func(struct cfg80211_nan_func *f);

		/**
		* struct cfg80211_nan_match_params - NAN match parameters
		* @type: the type of the function that triggered a match. If it is
		* %NL80211_NAN_FUNC_SUBSCRIBE it means that we replied to a subscriber.
		* If it is %NL80211_NAN_FUNC_PUBLISH, it means that we got a discovery
		* result.
		* If it is %NL80211_NAN_FUNC_FOLLOW_UP, we received a follow up.
		* @inst_id: the local instance id
		* @peer_inst_id: the instance id of the peer's function
		* @addr: the MAC address of the peer
		* @info_len: the length of the &info
		* @info: the Service Specific Info from the peer (if any)
		* @cookie: unique identifier of the corresponding function
		*/
		struct cfg80211_nan_match_params {
		enum nl80211_nan_function_type type;
		u8 inst_id;
		u8 peer_inst_id;
		const u8 *addr;
		u8 info_len;
		const u8 *info;
		u64 cookie;
		};

		/**
		* cfg80211_nan_match - report a match for a NAN function.
		* @wdev: the wireless device reporting the match
		* @match: match notification parameters
		* @gfp: allocation flags
		*
		* This function reports that the a NAN function had a match. This
		* can be a subscribe that had a match or a solicited publish that
		* was sent. It can also be a follow up that was received.
		*/
		void cfg80211_nan_match(struct wireless_dev *wdev,
		struct cfg80211_nan_match_params *match, gfp_t gfp);

		/**
		* cfg80211_nan_func_terminated - notify about NAN function termination.
		*
		* @wdev: the wireless device reporting the match
		* @inst_id: the local instance id
		* @reason: termination reason (one of the NL80211_NAN_FUNC_TERM_REASON_*)
		* @cookie: unique NAN function identifier
		* @gfp: allocation flags
		*
		* This function reports that the a NAN function is terminated.
		*/
		void cfg80211_nan_func_terminated(struct wireless_dev *wdev,
		u8 inst_id,
		enum nl80211_nan_func_term_reason reason,
		u64 cookie, gfp_t gfp);

		/* ethtool helper */
		void cfg80211_get_drvinfo(struct net_device dev, struct ethtool_drvinfo info);

include/net/fq.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -72,9 +72,12 @@ struct fq {
		u32 flows_cnt;
		u32 perturbation;
		u32 limit;
		u32 memory_limit;
		u32 memory_usage;
		u32 quantum;
		u32 backlog;
		u32 overlimit;
		u32 overmemory;
		u32 collisions;
		};

include/net/fq_impl.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ static struct sk_buff fq_flow_dequeue(struct fq fq,
		tin->backlog_packets--;
		flow->backlog -= skb->len;
		fq->backlog--;
		fq->memory_usage -= skb->truesize;

		if (flow->backlog == 0) {
		list_del_init(&flow->backlogchain);
		@@ -154,6 +155,7 @@ static void fq_tin_enqueue(struct fq *fq,
		flow->backlog += skb->len;
		tin->backlog_bytes += skb->len;
		tin->backlog_packets++;
		fq->memory_usage += skb->truesize;
		fq->backlog++;

		fq_recalc_backlog(fq, tin, flow);
		@@ -166,7 +168,7 @@ static void fq_tin_enqueue(struct fq *fq,

		__skb_queue_tail(&flow->queue, skb);

		if (fq->backlog > fq->limit) {
		if (fq->backlog > fq->limit \|\| fq->memory_usage > fq->memory_limit) {
		flow = list_first_entry_or_null(&fq->backlogs,
		struct fq_flow,
		backlogchain);
		@@ -181,6 +183,8 @@ static void fq_tin_enqueue(struct fq *fq,

		flow->tin->overlimit++;
		fq->overlimit++;
		if (fq->memory_usage > fq->memory_limit)
		fq->overmemory++;
		}
		}

		@@ -251,6 +255,7 @@ static int fq_init(struct fq *fq, int flows_cnt)
		fq->perturbation = prandom_u32();
		fq->quantum = 300;
		fq->limit = 8192;
		fq->memory_limit = 16 << 20; /* 16 MBytes */

		fq->flows = kcalloc(fq->flows_cnt, sizeof(fq->flows[0]), GFP_KERNEL);
		if (!fq->flows)

include/net/mac80211.h

+75 −0

Original line number	Diff line number	Diff line
		@@ -715,6 +715,7 @@ enum mac80211_tx_info_flags {
		* frame (PS-Poll or uAPSD).
		* @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information
		* @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame
		* @IEEE80211_TX_CTRL_FAST_XMIT: This frame is going through the fast_xmit path
		*
		* These flags are used in tx_info->control.flags.
		*/
		@@ -723,6 +724,7 @@ enum mac80211_tx_control_flags {
		IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1),
		IEEE80211_TX_CTRL_RATE_INJECT = BIT(2),
		IEEE80211_TX_CTRL_AMSDU = BIT(3),
		IEEE80211_TX_CTRL_FAST_XMIT = BIT(4),
		};

		/*
		@@ -2177,6 +2179,8 @@ enum ieee80211_hw_flags {
		* @n_cipher_schemes: a size of an array of cipher schemes definitions.
		* @cipher_schemes: a pointer to an array of cipher scheme definitions
		* supported by HW.
		* @max_nan_de_entries: maximum number of NAN DE functions supported by the
		* device.
		*/
		struct ieee80211_hw {
		struct ieee80211_conf conf;
		@@ -2211,6 +2215,7 @@ struct ieee80211_hw {
		u8 uapsd_max_sp_len;
		u8 n_cipher_schemes;
		const struct ieee80211_cipher_scheme *cipher_schemes;
		u8 max_nan_de_entries;
		};

		static inline bool _ieee80211_hw_check(struct ieee80211_hw *hw,
		@@ -3166,6 +3171,12 @@ enum ieee80211_reconfig_type {
		* required function.
		* The callback can sleep.
		*
		* @offset_tsf: Offset the TSF timer by the specified value in the
		* firmware/hardware. Preferred to set_tsf as it avoids delay between
		* calling set_tsf() and hardware getting programmed, which will show up
		* as TSF delay. Is not a required function.
		* The callback can sleep.
		*
		* @reset_tsf: Reset the TSF timer and allow firmware/hardware to synchronize
		* with other STAs in the IBSS. This is only used in IBSS mode. This
		* function is optional if the firmware/hardware takes full care of
		@@ -3420,6 +3431,21 @@ enum ieee80211_reconfig_type {
		* synchronization which is needed in case driver has in its RSS queues
		* pending frames that were received prior to the control path action
		* currently taken (e.g. disassociation) but are not processed yet.
		*
		* @start_nan: join an existing NAN cluster, or create a new one.
		* @stop_nan: leave the NAN cluster.
		* @nan_change_conf: change NAN configuration. The data in cfg80211_nan_conf
		* contains full new configuration and changes specify which parameters
		* are changed with respect to the last NAN config.
		* The driver gets both full configuration and the changed parameters since
		* some devices may need the full configuration while others need only the
		* changed parameters.
		* @add_nan_func: Add a NAN function. Returns 0 on success. The data in
		* cfg80211_nan_func must not be referenced outside the scope of
		* this call.
		* @del_nan_func: Remove a NAN function. The driver must call
		* ieee80211_nan_func_terminated() with
		* NL80211_NAN_FUNC_TERM_REASON_USER_REQUEST reason code upon removal.
		*/
		struct ieee80211_ops {
		void (tx)(struct ieee80211_hw hw,
		@@ -3531,6 +3557,8 @@ struct ieee80211_ops {
		u64 (get_tsf)(struct ieee80211_hw hw, struct ieee80211_vif *vif);
		void (set_tsf)(struct ieee80211_hw hw, struct ieee80211_vif *vif,
		u64 tsf);
		void (offset_tsf)(struct ieee80211_hw hw, struct ieee80211_vif *vif,
		s64 offset);
		void (reset_tsf)(struct ieee80211_hw hw, struct ieee80211_vif *vif);
		int (tx_last_beacon)(struct ieee80211_hw hw);
		int (ampdu_action)(struct ieee80211_hw hw,
		@@ -3655,6 +3683,21 @@ struct ieee80211_ops {
		void (wake_tx_queue)(struct ieee80211_hw hw,
		struct ieee80211_txq *txq);
		void (sync_rx_queues)(struct ieee80211_hw hw);

		int (start_nan)(struct ieee80211_hw hw,
		struct ieee80211_vif *vif,
		struct cfg80211_nan_conf *conf);
		int (stop_nan)(struct ieee80211_hw hw,
		struct ieee80211_vif *vif);
		int (nan_change_conf)(struct ieee80211_hw hw,
		struct ieee80211_vif *vif,
		struct cfg80211_nan_conf *conf, u32 changes);
		int (add_nan_func)(struct ieee80211_hw hw,
		struct ieee80211_vif *vif,
		const struct cfg80211_nan_func *nan_func);
		void (del_nan_func)(struct ieee80211_hw hw,
		struct ieee80211_vif *vif,
		u8 instance_id);
		};

		/**
		@@ -5728,4 +5771,36 @@ struct sk_buff ieee80211_tx_dequeue(struct ieee80211_hw hw,
		void ieee80211_txq_get_depth(struct ieee80211_txq *txq,
		unsigned long *frame_cnt,
		unsigned long *byte_cnt);

		/**
		* ieee80211_nan_func_terminated - notify about NAN function termination.
		*
		* This function is used to notify mac80211 about NAN function termination.
		* Note that this function can't be called from hard irq.
		*
		* @vif: &struct ieee80211_vif pointer from the add_interface callback.
		* @inst_id: the local instance id
		* @reason: termination reason (one of the NL80211_NAN_FUNC_TERM_REASON_*)
		* @gfp: allocation flags
		*/
		void ieee80211_nan_func_terminated(struct ieee80211_vif *vif,
		u8 inst_id,
		enum nl80211_nan_func_term_reason reason,
		gfp_t gfp);

		/**
		* ieee80211_nan_func_match - notify about NAN function match event.
		*
		* This function is used to notify mac80211 about NAN function match. The
		* cookie inside the match struct will be assigned by mac80211.
		* Note that this function can't be called from hard irq.
		*
		* @vif: &struct ieee80211_vif pointer from the add_interface callback.
		* @match: match event information
		* @gfp: allocation flags
		*/
		void ieee80211_nan_func_match(struct ieee80211_vif *vif,
		struct cfg80211_nan_match_params *match,
		gfp_t gfp);

		#endif /* MAC80211_H */

include/uapi/linux/nl80211.h

+269 −1

File changed.

Preview size limit exceeded, changes collapsed.

Admin message