Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next (5419575e) · Commits · e / devices / android_kernel_samsung_universal8895

drivers/net/wireless/ath/ath6kl/cfg80211.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1488,7 +1488,7 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy,
	}		}

	static struct wireless_dev ath6kl_cfg80211_add_iface(struct wiphy wiphy,		static struct wireless_dev ath6kl_cfg80211_add_iface(struct wiphy wiphy,
	char *name,		const char *name,
	enum nl80211_iftype type,		enum nl80211_iftype type,
	u32 *flags,		u32 *flags,
	struct vif_params *params)		struct vif_params *params)
	@@ -3477,7 +3477,7 @@ void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif)
	ar->num_vif--;		ar->num_vif--;
	}		}

	struct wireless_dev ath6kl_interface_add(struct ath6kl ar, char *name,		struct wireless_dev ath6kl_interface_add(struct ath6kl ar, const char *name,
	enum nl80211_iftype type,		enum nl80211_iftype type,
	u8 fw_vif_idx, u8 nw_type)		u8 fw_vif_idx, u8 nw_type)
	{		{

drivers/net/wireless/ath/ath6kl/cfg80211.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@ enum ath6kl_cfg_suspend_mode {
	ATH6KL_CFG_SUSPEND_SCHED_SCAN,		ATH6KL_CFG_SUSPEND_SCHED_SCAN,
	};		};

	struct wireless_dev ath6kl_interface_add(struct ath6kl ar, char *name,		struct wireless_dev ath6kl_interface_add(struct ath6kl ar, const char *name,
	enum nl80211_iftype type,		enum nl80211_iftype type,
	u8 fw_vif_idx, u8 nw_type);		u8 fw_vif_idx, u8 nw_type);
	void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq,		void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq,

drivers/net/wireless/mwifiex/cfg80211.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1636,7 +1636,7 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info,
	* create a new virtual interface with the given name		* create a new virtual interface with the given name
	*/		*/
	struct wireless_dev mwifiex_add_virtual_intf(struct wiphy wiphy,		struct wireless_dev mwifiex_add_virtual_intf(struct wiphy wiphy,
	char *name,		const char *name,
	enum nl80211_iftype type,		enum nl80211_iftype type,
	u32 *flags,		u32 *flags,
	struct vif_params *params)		struct vif_params *params)

drivers/net/wireless/mwifiex/main.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1033,7 +1033,7 @@ int mwifiex_check_network_compatibility(struct mwifiex_private *priv,
	struct mwifiex_bssdescriptor *bss_desc);		struct mwifiex_bssdescriptor *bss_desc);

	struct wireless_dev mwifiex_add_virtual_intf(struct wiphy wiphy,		struct wireless_dev mwifiex_add_virtual_intf(struct wiphy wiphy,
	char *name,		const char *name,
	enum nl80211_iftype type,		enum nl80211_iftype type,
	u32 *flags,		u32 *flags,
	struct vif_params *params);		struct vif_params *params);

include/linux/nl80211.h

+24 −0

Original line number	Original line	Diff line number	Diff line
	@@ -573,6 +573,11 @@
	* @NL80211_CMD_STOP_P2P_DEVICE: Stop the given P2P Device, identified by		* @NL80211_CMD_STOP_P2P_DEVICE: Stop the given P2P Device, identified by
	* its %NL80211_ATTR_WDEV identifier.		* its %NL80211_ATTR_WDEV identifier.
	*		*
			* @NL80211_CMD_CONN_FAILED: connection request to an AP failed; used to
			* notify userspace that AP has rejected the connection request from a
			* station, due to particular reason. %NL80211_ATTR_CONN_FAILED_REASON
			* is used for this.
			*
	* @NL80211_CMD_MAX: highest used command number		* @NL80211_CMD_MAX: highest used command number
	* @__NL80211_CMD_AFTER_LAST: internal use		* @__NL80211_CMD_AFTER_LAST: internal use
	*/		*/
	@@ -719,6 +724,8 @@ enum nl80211_commands {
	NL80211_CMD_START_P2P_DEVICE,		NL80211_CMD_START_P2P_DEVICE,
	NL80211_CMD_STOP_P2P_DEVICE,		NL80211_CMD_STOP_P2P_DEVICE,

			NL80211_CMD_CONN_FAILED,

	/* add new commands above here */		/* add new commands above here */

	/* used to define NL80211_CMD_MAX below */		/* used to define NL80211_CMD_MAX below */
	@@ -1262,6 +1269,10 @@ enum nl80211_commands {
	* was used to provide the hint. For the different types of		* was used to provide the hint. For the different types of
	* allowed user regulatory hints see nl80211_user_reg_hint_type.		* allowed user regulatory hints see nl80211_user_reg_hint_type.
	*		*
			* @NL80211_ATTR_CONN_FAILED_REASON: The reason for which AP has rejected
			* the connection request from a station. nl80211_connect_failed_reason
			* enum has different reasons of connection failure.
			*
	* @NL80211_ATTR_MAX: highest attribute number currently defined		* @NL80211_ATTR_MAX: highest attribute number currently defined
	* @__NL80211_ATTR_AFTER_LAST: internal use		* @__NL80211_ATTR_AFTER_LAST: internal use
	*/		*/
	@@ -1517,6 +1528,8 @@ enum nl80211_attrs {

	NL80211_ATTR_USER_REG_HINT_TYPE,		NL80211_ATTR_USER_REG_HINT_TYPE,

			NL80211_ATTR_CONN_FAILED_REASON,

	/* add attributes here, update the policy in nl80211.c */		/* add attributes here, update the policy in nl80211.c */

	__NL80211_ATTR_AFTER_LAST,		__NL80211_ATTR_AFTER_LAST,
	@@ -3045,4 +3058,15 @@ enum nl80211_probe_resp_offload_support_attr {
	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U = 1<<3,		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U = 1<<3,
	};		};

			/**
			* enum nl80211_connect_failed_reason - connection request failed reasons
			* @NL80211_CONN_FAIL_MAX_CLIENTS: Maximum number of clients that can be
			* handled by the AP is reached.
			* @NL80211_CONN_FAIL_BLOCKED_CLIENT: Client's MAC is in the AP's blocklist.
			*/
			enum nl80211_connect_failed_reason {
			NL80211_CONN_FAIL_MAX_CLIENTS,
			NL80211_CONN_FAIL_BLOCKED_CLIENT,
			};

	#endif /* __LINUX_NL80211_H */		#endif /* __LINUX_NL80211_H */