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

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -84,6 +84,15 @@ static const struct ieee80211_iface_limit iwl_mvm_limits[] = {
		.types = BIT(NL80211_IFTYPE_STATION) \|
		BIT(NL80211_IFTYPE_AP),
		},
		{
		.max = 1,
		.types = BIT(NL80211_IFTYPE_P2P_CLIENT) \|
		BIT(NL80211_IFTYPE_P2P_GO),
		},
		{
		.max = 1,
		.types = BIT(NL80211_IFTYPE_P2P_DEVICE),
		},
		};

		static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {
		@@ -164,7 +173,10 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
		hw->chanctx_data_size = sizeof(u16);

		hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) \|
		BIT(NL80211_IFTYPE_AP);
		BIT(NL80211_IFTYPE_P2P_CLIENT) \|
		BIT(NL80211_IFTYPE_AP) \|
		BIT(NL80211_IFTYPE_P2P_GO) \|
		BIT(NL80211_IFTYPE_P2P_DEVICE);

		hw->wiphy->flags \|= WIPHY_FLAG_CUSTOM_REGULATORY \|
		WIPHY_FLAG_DISABLE_BEACON_HINTS \|

+3 −1

Original line number	Diff line number	Diff line
		@@ -2169,6 +2169,7 @@ static const struct ieee80211_iface_limit hwsim_if_limits[] = {
		#endif
		BIT(NL80211_IFTYPE_AP) \|
		BIT(NL80211_IFTYPE_P2P_GO) },
		{ .max = 1, .types = BIT(NL80211_IFTYPE_P2P_DEVICE) },
		};

		static struct ieee80211_iface_combination hwsim_if_comb = {
		@@ -2294,7 +2295,8 @@ static int __init init_mac80211_hwsim(void)
		BIT(NL80211_IFTYPE_P2P_CLIENT) \|
		BIT(NL80211_IFTYPE_P2P_GO) \|
		BIT(NL80211_IFTYPE_ADHOC) \|
		BIT(NL80211_IFTYPE_MESH_POINT);
		BIT(NL80211_IFTYPE_MESH_POINT) \|
		BIT(NL80211_IFTYPE_P2P_DEVICE);

		hw->flags = IEEE80211_HW_MFP_CAPABLE \|
		IEEE80211_HW_SIGNAL_DBM \|

+2 −1

Original line number	Diff line number	Diff line
		@@ -961,6 +961,7 @@ struct station_info {
		* @MONITOR_FLAG_CONTROL: pass control frames
		* @MONITOR_FLAG_OTHER_BSS: disable BSSID filtering
		* @MONITOR_FLAG_COOK_FRAMES: report frames after processing
		* @MONITOR_FLAG_ACTIVE: active monitor, ACKs frames on its MAC address
		*/
		enum monitor_flags {
		MONITOR_FLAG_FCSFAIL = 1<<NL80211_MNTR_FLAG_FCSFAIL,
		@@ -968,6 +969,7 @@ enum monitor_flags {
		MONITOR_FLAG_CONTROL = 1<<NL80211_MNTR_FLAG_CONTROL,
		MONITOR_FLAG_OTHER_BSS = 1<<NL80211_MNTR_FLAG_OTHER_BSS,
		MONITOR_FLAG_COOK_FRAMES = 1<<NL80211_MNTR_FLAG_COOK_FRAMES,
		MONITOR_FLAG_ACTIVE = 1<<NL80211_MNTR_FLAG_ACTIVE,
		};

		/**
		@@ -2867,7 +2869,6 @@ struct cfg80211_cached_keys;
		* @mgmt_registrations_lock: lock for the list
		* @mtx: mutex used to lock data in this struct, may be used by drivers
		* and some API functions require it held
		* @cleanup_work: work struct used for cleanup that can't be done directly
		* @beacon_interval: beacon interval used on this device for transmitting
		* beacons, 0 when not valid
		* @address: The address for this device, valid only if @netdev is %NULL

+4 −0

Original line number	Diff line number	Diff line
		@@ -2428,6 +2428,8 @@ enum nl80211_survey_info {
		* @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering
		* @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.
		* overrides all other flags.
		* @NL80211_MNTR_FLAG_ACTIVE: use the configured MAC address
		* and ACK incoming unicast packets.
		*
		* @__NL80211_MNTR_FLAG_AFTER_LAST: internal use
		* @NL80211_MNTR_FLAG_MAX: highest possible monitor flag
		@@ -2439,6 +2441,7 @@ enum nl80211_mntr_flags {
		NL80211_MNTR_FLAG_CONTROL,
		NL80211_MNTR_FLAG_OTHER_BSS,
		NL80211_MNTR_FLAG_COOK_FRAMES,
		NL80211_MNTR_FLAG_ACTIVE,

		/* keep last */
		__NL80211_MNTR_FLAG_AFTER_LAST,
		@@ -3595,6 +3598,7 @@ enum nl80211_feature_flags {
		NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 1 << 14,
		NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 15,
		NL80211_FEATURE_USERSPACE_MPM = 1 << 16,
		NL80211_FEATURE_ACTIVE_MONITOR = 1 << 17,
		};

		/**

+9 −4

Original line number	Diff line number	Diff line
		@@ -73,16 +73,19 @@ static int ieee80211_change_iface(struct wiphy *wiphy,
		struct ieee80211_local *local = sdata->local;

		if (ieee80211_sdata_running(sdata)) {
		u32 mask = MONITOR_FLAG_COOK_FRAMES \|
		MONITOR_FLAG_ACTIVE;

		/*
		* Prohibit MONITOR_FLAG_COOK_FRAMES to be
		* changed while the interface is up.
		* Prohibit MONITOR_FLAG_COOK_FRAMES and
		* MONITOR_FLAG_ACTIVE to be changed while the
		* interface is up.
		* Else we would need to add a lot of cruft
		* to update everything:
		* cooked_mntrs, monitor and all fif_* counters
		* reconfigure hardware
		*/
		if ((*flags & MONITOR_FLAG_COOK_FRAMES) !=
		(sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES))
		if ((*flags & mask) != (sdata->u.mntr_flags & mask))
		return -EBUSY;

		ieee80211_adjust_monitor_flags(sdata, -1);
		@@ -2375,7 +2378,9 @@ static int ieee80211_set_power_mgmt(struct wiphy wiphy, struct net_device dev,
		local->dynamic_ps_forced_timeout = timeout;

		/* no change, but if automatic follow powersave */
		sdata_lock(sdata);
		__ieee80211_request_smps(sdata, sdata->u.mgd.req_smps);
		sdata_unlock(sdata);

		if (local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_PS)
		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);