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

Documentation/DocBook/80211.tmpl

+2 −2

Original line number	Diff line number	Diff line
		@@ -152,8 +152,8 @@
		!Finclude/net/cfg80211.h cfg80211_scan_request
		!Finclude/net/cfg80211.h cfg80211_scan_done
		!Finclude/net/cfg80211.h cfg80211_bss
		!Finclude/net/cfg80211.h cfg80211_inform_bss_frame
		!Finclude/net/cfg80211.h cfg80211_inform_bss
		!Finclude/net/cfg80211.h cfg80211_inform_bss_width_frame
		!Finclude/net/cfg80211.h cfg80211_inform_bss_width
		!Finclude/net/cfg80211.h cfg80211_unlink_bss
		!Finclude/net/cfg80211.h cfg80211_find_ie
		!Finclude/net/cfg80211.h ieee80211_bss_get_ie

drivers/net/wireless/mac80211_hwsim.c

+24 −3

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ struct hwsim_vif_priv {
		u32 magic;
		u8 bssid[ETH_ALEN];
		bool assoc;
		bool bcn_en;
		u16 aid;
		};

		@@ -1170,6 +1171,16 @@ static void mac80211_hwsim_configure_filter(struct ieee80211_hw *hw,
		*total_flags = data->rx_filter;
		}

		static void mac80211_hwsim_bcn_en_iter(void data, u8 mac,
		struct ieee80211_vif *vif)
		{
		unsigned int *count = data;
		struct hwsim_vif_priv vp = (void )vif->drv_priv;

		if (vp->bcn_en)
		(*count)++;
		}

		static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		struct ieee80211_bss_conf *info,
		@@ -1180,7 +1191,8 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,

		hwsim_check_magic(vif);

		wiphy_debug(hw->wiphy, "%s(changed=0x%x)\n", __func__, changed);
		wiphy_debug(hw->wiphy, "%s(changed=0x%x vif->addr=%pM)\n",
		__func__, changed, vif->addr);

		if (changed & BSS_CHANGED_BSSID) {
		wiphy_debug(hw->wiphy, "%s: BSSID changed: %pM\n",
		@@ -1202,6 +1214,7 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,

		if (changed & BSS_CHANGED_BEACON_ENABLED) {
		wiphy_debug(hw->wiphy, " BCN EN: %d\n", info->enable_beacon);
		vp->bcn_en = info->enable_beacon;
		if (data->started &&
		!hrtimer_is_queued(&data->beacon_timer.timer) &&
		info->enable_beacon) {
		@@ -1215,9 +1228,17 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
		tasklet_hrtimer_start(&data->beacon_timer,
		ns_to_ktime(until_tbtt * 1000),
		HRTIMER_MODE_REL);
		} else if (!info->enable_beacon)
		} else if (!info->enable_beacon) {
		unsigned int count = 0;
		ieee80211_iterate_active_interfaces(
		data->hw, IEEE80211_IFACE_ITER_NORMAL,
		mac80211_hwsim_bcn_en_iter, &count);
		wiphy_debug(hw->wiphy, " beaconing vifs remaining: %u",
		count);
		if (count == 0)
		tasklet_hrtimer_cancel(&data->beacon_timer);
		}
		}

		if (changed & BSS_CHANGED_ERP_CTS_PROT) {
		wiphy_debug(hw->wiphy, " ERP_CTS_PROT: %d\n",

include/linux/ieee80211.h

+20 −0

Original line number	Diff line number	Diff line
		@@ -696,6 +696,18 @@ struct ieee80211_sec_chan_offs_ie {
		u8 sec_chan_offs;
		} __packed;

		/**
		* struct ieee80211_mesh_chansw_params_ie - mesh channel switch parameters IE
		*
		* This structure represents the "Mesh Channel Switch Paramters element"
		*/
		struct ieee80211_mesh_chansw_params_ie {
		u8 mesh_ttl;
		u8 mesh_flags;
		__le16 mesh_reason;
		__le16 mesh_pre_value;
		} __packed;

		/**
		* struct ieee80211_wide_bw_chansw_ie - wide bandwidth channel switch IE
		*/
		@@ -750,6 +762,14 @@ enum mesh_config_capab_flags {
		IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL = 0x40,
		};

		/**
		* mesh channel switch parameters element's flag indicator
		*
		*/
		#define WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT BIT(0)
		#define WLAN_EID_CHAN_SWITCH_PARAM_INITIATOR BIT(1)
		#define WLAN_EID_CHAN_SWITCH_PARAM_REASON BIT(2)

		/**
		* struct ieee80211_rann_ie
		*

include/net/cfg80211.h

+14 −0

Original line number	Diff line number	Diff line
		@@ -744,6 +744,10 @@ enum station_parameters_apply_mask {
		* @capability: station capability
		* @ext_capab: extended capabilities of the station
		* @ext_capab_len: number of extended capabilities
		* @supported_channels: supported channels in IEEE 802.11 format
		* @supported_channels_len: number of supported channels
		* @supported_oper_classes: supported oper classes in IEEE 802.11 format
		* @supported_oper_classes_len: number of supported operating classes
		*/
		struct station_parameters {
		const u8 *supported_rates;
		@@ -763,6 +767,10 @@ struct station_parameters {
		u16 capability;
		const u8 *ext_capab;
		u8 ext_capab_len;
		const u8 *supported_channels;
		u8 supported_channels_len;
		const u8 *supported_oper_classes;
		u8 supported_oper_classes_len;
		};

		/**
		@@ -1656,6 +1664,9 @@ struct cfg80211_disassoc_request {
		* sets/clears %NL80211_STA_FLAG_AUTHORIZED. If true, the driver is
		* required to assume that the port is unauthorized until authorized by
		* user space. Otherwise, port is marked authorized by default.
		* @userspace_handles_dfs: whether user space controls DFS operation, i.e.
		* changes the channel when a radar is detected. This is required
		* to operate on DFS channels.
		* @basic_rates: bitmap of basic rates to use when creating the IBSS
		* @mcast_rate: per-band multicast rate index + 1 (0: disabled)
		* @ht_capa: HT Capabilities over-rides. Values set in ht_capa_mask
		@@ -1673,6 +1684,7 @@ struct cfg80211_ibss_params {
		bool channel_fixed;
		bool privacy;
		bool control_port;
		bool userspace_handles_dfs;
		int mcast_rate[IEEE80211_NUM_BANDS];
		struct ieee80211_ht_cap ht_capa;
		struct ieee80211_ht_cap ht_capa_mask;
		@@ -3053,6 +3065,7 @@ struct cfg80211_cached_keys;
		* @conn: (private) cfg80211 software SME connection state machine data
		* @connect_keys: (private) keys to set after connection is established
		* @ibss_fixed: (private) IBSS is using fixed BSSID
		* @ibss_dfs_possible: (private) IBSS may change to a DFS channel
		* @event_list: (private) list for internal event processing
		* @event_lock: (private) lock for event list
		*/
		@@ -3091,6 +3104,7 @@ struct wireless_dev {
		struct ieee80211_channel *channel;

		bool ibss_fixed;
		bool ibss_dfs_possible;

		bool ps;
		int ps_timeout;

include/net/mac80211.h

+18 −0

Original line number	Diff line number	Diff line
		@@ -1503,6 +1503,10 @@ 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
		@@ -4567,4 +4571,18 @@ 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 */