Commit de51f164 authored by John W. Linville's avatar John W. Linville
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 



Johannes Berg <johannes@sipsolutions.net> says:

"This time I have Felix's no-status rate control work, which will allow
drivers to work better with rate control even if they don't have perfect
status reporting. In addition to this, a small hwsim fix from Patrik,
one of the regulatory patches from Arik, and a number of cleanups and
fixes I did myself.

Of note is a patch where I disable CFG80211_WEXT so that compatibility
is no longer selectable - this is intended as a wake-up call for anyone
who's still using it, and is still easily worked around (it's a one-line
patch) before we fully remove the code as well in the future."

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents 04bb7ecf f027c2ac

drivers/net/wireless/mac80211_hwsim.c

+3 −2
Original line number Diff line number Diff line
@@ -2388,7 +2388,6 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
		sband->vht_cap.cap =

			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |

			IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ |

			IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |

			IEEE80211_VHT_CAP_RXLDPC |

			IEEE80211_VHT_CAP_SHORT_GI_80 |

			IEEE80211_VHT_CAP_SHORT_GI_160 |
@@ -2543,7 +2542,9 @@ static int mac80211_hwsim_get_radio(struct sk_buff *skb, 
	if (cb)

		genl_dump_check_consistent(cb, hdr, &hwsim_genl_family);



	if (data->alpha2[0] && data->alpha2[1])

		param.reg_alpha2 = data->alpha2;



	param.reg_strict = !!(data->hw->wiphy->regulatory_flags &

					REGULATORY_STRICT_REG);

	param.p2p_device = !!(data->hw->wiphy->interface_modes &

drivers/net/wireless/ti/wlcore/event.c

+1 −4
Original line number Diff line number Diff line
@@ -259,10 +259,7 @@ void wlcore_event_beacon_loss(struct wl1271 *wl, unsigned long roles_bitmap) 
					     &wlvif->connection_loss_work,

					     msecs_to_jiffies(delay));



		ieee80211_cqm_rssi_notify(

				vif,

				NL80211_CQM_RSSI_BEACON_LOSS_EVENT,

				GFP_KERNEL);

		ieee80211_cqm_beacon_loss_notify(vif, GFP_KERNEL);

	}

}

EXPORT_SYMBOL_GPL(wlcore_event_beacon_loss);

include/net/cfg80211.h

+36 −27
Original line number Diff line number Diff line
@@ -4642,33 +4642,6 @@ void cfg80211_cqm_rssi_notify(struct net_device *dev, 
			      enum nl80211_cqm_rssi_threshold_event rssi_event,

			      gfp_t gfp);



/**

 * cfg80211_radar_event - radar detection event

 * @wiphy: the wiphy

 * @chandef: chandef for the current channel

 * @gfp: context flags

 *

 * This function is called when a radar is detected on the current chanenl.

 */

void cfg80211_radar_event(struct wiphy *wiphy,

			  struct cfg80211_chan_def *chandef, gfp_t gfp);



/**

 * cfg80211_cac_event - Channel availability check (CAC) event

 * @netdev: network device

 * @chandef: chandef for the current channel

 * @event: type of event

 * @gfp: context flags

 *

 * This function is called when a Channel availability check (CAC) is finished

 * or aborted. This must be called to notify the completion of a CAC process,

 * also by full-MAC drivers.

 */

void cfg80211_cac_event(struct net_device *netdev,

			const struct cfg80211_chan_def *chandef,

			enum nl80211_radar_event event, gfp_t gfp);





/**

 * cfg80211_cqm_pktloss_notify - notify userspace about packetloss to peer

 * @dev: network device
@@ -4696,6 +4669,42 @@ void cfg80211_cqm_pktloss_notify(struct net_device *dev, 
void cfg80211_cqm_txe_notify(struct net_device *dev, const u8 *peer,

			     u32 num_packets, u32 rate, u32 intvl, gfp_t gfp);



/**

 * cfg80211_cqm_beacon_loss_notify - beacon loss event

 * @dev: network device

 * @gfp: context flags

 *

 * Notify userspace about beacon loss from the connected AP.

 */

void cfg80211_cqm_beacon_loss_notify(struct net_device *dev, gfp_t gfp);



/**

 * cfg80211_radar_event - radar detection event

 * @wiphy: the wiphy

 * @chandef: chandef for the current channel

 * @gfp: context flags

 *

 * This function is called when a radar is detected on the current chanenl.

 */

void cfg80211_radar_event(struct wiphy *wiphy,

			  struct cfg80211_chan_def *chandef, gfp_t gfp);



/**

 * cfg80211_cac_event - Channel availability check (CAC) event

 * @netdev: network device

 * @chandef: chandef for the current channel

 * @event: type of event

 * @gfp: context flags

 *

 * This function is called when a Channel availability check (CAC) is finished

 * or aborted. This must be called to notify the completion of a CAC process,

 * also by full-MAC drivers.

 */

void cfg80211_cac_event(struct net_device *netdev,

			const struct cfg80211_chan_def *chandef,

			enum nl80211_radar_event event, gfp_t gfp);





/**

 * cfg80211_gtk_rekey_notify - notify userspace about driver rekeying

 * @dev: network device

include/net/mac80211.h

+32 −0
Original line number Diff line number Diff line
@@ -3618,6 +3618,26 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif, 
void ieee80211_tx_status(struct ieee80211_hw *hw,

			 struct sk_buff *skb);



/**

 * ieee80211_tx_status_noskb - transmit status callback without skb

 *

 * This function can be used as a replacement for ieee80211_tx_status

 * in drivers that cannot reliably map tx status information back to

 * specific skbs.

 *

 * Calls to this function for a single hardware must be synchronized

 * against each other. Calls to this function, ieee80211_tx_status_ni()

 * and ieee80211_tx_status_irqsafe() may not be mixed for a single hardware.

 *

 * @hw: the hardware the frame was transmitted by

 * @sta: the receiver station to which this packet is sent

 *	(NULL for multicast packets)

 * @info: tx status information

 */

void ieee80211_tx_status_noskb(struct ieee80211_hw *hw,

			       struct ieee80211_sta *sta,

			       struct ieee80211_tx_info *info);



/**

 * ieee80211_tx_status_ni - transmit status callback (in process context)

 *
@@ -4671,6 +4691,14 @@ void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif, 
			       enum nl80211_cqm_rssi_threshold_event rssi_event,

			       gfp_t gfp);



/**

 * ieee80211_cqm_beacon_loss_notify - inform CQM of beacon loss

 *

 * @vif: &struct ieee80211_vif pointer from the add_interface callback.

 * @gfp: context flags

 */

void ieee80211_cqm_beacon_loss_notify(struct ieee80211_vif *vif, gfp_t gfp);



/**

 * ieee80211_radar_detected - inform that a radar was detected

 *
@@ -4829,6 +4857,10 @@ struct rate_control_ops { 
	void (*free_sta)(void *priv, struct ieee80211_sta *sta,

			 void *priv_sta);



	void (*tx_status_noskb)(void *priv,

				struct ieee80211_supported_band *sband,

				struct ieee80211_sta *sta, void *priv_sta,

				struct ieee80211_tx_info *info);

	void (*tx_status)(void *priv, struct ieee80211_supported_band *sband,

			  struct ieee80211_sta *sta, void *priv_sta,

			  struct sk_buff *skb);

include/net/regulatory.h

+12 −0
Original line number Diff line number Diff line
@@ -136,6 +136,17 @@ struct regulatory_request { 
 *      otherwise initiating radiation is not allowed. This will enable the

 *      relaxations enabled under the CFG80211_REG_RELAX_NO_IR configuration

 *      option

 * @REGULATORY_IGNORE_STALE_KICKOFF: the regulatory core will _not_ make sure

 *	all interfaces on this wiphy reside on allowed channels. If this flag

 *	is not set, upon a regdomain change, the interfaces are given a grace

 *	period (currently 60 seconds) to disconnect or move to an allowed

 *	channel. Interfaces on forbidden channels are forcibly disconnected.

 *	Currently these types of interfaces are supported for enforcement:

 *	NL80211_IFTYPE_ADHOC, NL80211_IFTYPE_STATION, NL80211_IFTYPE_AP,

 *	NL80211_IFTYPE_AP_VLAN, NL80211_IFTYPE_MONITOR,

 *	NL80211_IFTYPE_P2P_CLIENT, NL80211_IFTYPE_P2P_GO,

 *	NL80211_IFTYPE_P2P_DEVICE. The flag will be set by default if a device

 *	includes any modes unsupported for enforcement checking.

 */

enum ieee80211_regulatory_flags {

	REGULATORY_CUSTOM_REG			= BIT(0),
@@ -144,6 +155,7 @@ enum ieee80211_regulatory_flags { 
	REGULATORY_COUNTRY_IE_FOLLOW_POWER	= BIT(3),

	REGULATORY_COUNTRY_IE_IGNORE		= BIT(4),

	REGULATORY_ENABLE_RELAX_NO_IR           = BIT(5),

	REGULATORY_IGNORE_STALE_KICKOFF         = BIT(6),

};



struct ieee80211_freq_range {

CRA Git | Maintained and supported by SUSTech CRA and CCSE