Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41f9ba67 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2018-06-15' of... 

Merge tag 'mac80211-for-davem-2018-06-15' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
A handful of fixes:
 * missing RCU grace period enforcement led to drivers freeing
   data structures before; fix from Dedy Lansky.
 * hwsim module init error paths were messed up; fixed it myself
   after a report from Colin King (who had sent a partial patch)
 * kernel-doc tag errors; fix from Luca Coelho
 * initialize the on-stack sinfo data structure when getting
   station information; fix from Sven Eckelmann
 * TXQ state dumping is now done from init, and when TXQs aren't
   initialized yet at that point, bad things happen, move the
   initialization; fix from Toke Høiland-Jørgensen.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ab188e8f bf2b61a6

drivers/net/wireless/mac80211_hwsim.c

+9 −2
Original line number Diff line number Diff line
@@ -3572,11 +3572,14 @@ static int __init init_mac80211_hwsim(void) 
	hwsim_wq = alloc_workqueue("hwsim_wq", 0, 0);

	if (!hwsim_wq)

		return -ENOMEM;

	rhashtable_init(&hwsim_radios_rht, &hwsim_rht_params);



	err = rhashtable_init(&hwsim_radios_rht, &hwsim_rht_params);

	if (err)

		goto out_free_wq;



	err = register_pernet_device(&hwsim_net_ops);

	if (err)

		return err;

		goto out_free_rht;



	err = platform_driver_register(&mac80211_hwsim_driver);

	if (err)
@@ -3701,6 +3704,10 @@ static int __init init_mac80211_hwsim(void) 
	platform_driver_unregister(&mac80211_hwsim_driver);

out_unregister_pernet:

	unregister_pernet_device(&hwsim_net_ops);

out_free_rht:

	rhashtable_destroy(&hwsim_radios_rht);

out_free_wq:

	destroy_workqueue(hwsim_wq);

	return err;

}

module_init(init_mac80211_hwsim);

include/uapi/linux/nl80211.h

+14 −14
Original line number Diff line number Diff line
@@ -981,18 +981,18 @@ 
 *	only the %NL80211_ATTR_IE data is used and updated with this command.

 *

 * @NL80211_CMD_SET_PMK: For offloaded 4-Way handshake, set the PMK or PMK-R0

 *	for the given authenticator address (specified with &NL80211_ATTR_MAC).

 *	When &NL80211_ATTR_PMKR0_NAME is set, &NL80211_ATTR_PMK specifies the

 *	for the given authenticator address (specified with %NL80211_ATTR_MAC).

 *	When %NL80211_ATTR_PMKR0_NAME is set, %NL80211_ATTR_PMK specifies the

 *	PMK-R0, otherwise it specifies the PMK.

 * @NL80211_CMD_DEL_PMK: For offloaded 4-Way handshake, delete the previously

 *	configured PMK for the authenticator address identified by

 *	&NL80211_ATTR_MAC.

 *	%NL80211_ATTR_MAC.

 * @NL80211_CMD_PORT_AUTHORIZED: An event that indicates that the 4 way

 *	handshake was completed successfully by the driver. The BSSID is

 *	specified with &NL80211_ATTR_MAC. Drivers that support 4 way handshake

 *	specified with %NL80211_ATTR_MAC. Drivers that support 4 way handshake

 *	offload should send this event after indicating 802.11 association with

 *	&NL80211_CMD_CONNECT or &NL80211_CMD_ROAM. If the 4 way handshake failed

 *	&NL80211_CMD_DISCONNECT should be indicated instead.

 *	%NL80211_CMD_CONNECT or %NL80211_CMD_ROAM. If the 4 way handshake failed

 *	%NL80211_CMD_DISCONNECT should be indicated instead.

 *

 * @NL80211_CMD_CONTROL_PORT_FRAME: Control Port (e.g. PAE) frame TX request

 *	and RX notification.  This command is used both as a request to transmit
@@ -1029,9 +1029,9 @@ 
 *	initiated the connection through the connect request.

 *

 * @NL80211_CMD_STA_OPMODE_CHANGED: An event that notify station's

 *	ht opmode or vht opmode changes using any of &NL80211_ATTR_SMPS_MODE,

 *	&NL80211_ATTR_CHANNEL_WIDTH,&NL80211_ATTR_NSS attributes with its

 *	address(specified in &NL80211_ATTR_MAC).

 *	ht opmode or vht opmode changes using any of %NL80211_ATTR_SMPS_MODE,

 *	%NL80211_ATTR_CHANNEL_WIDTH,%NL80211_ATTR_NSS attributes with its

 *	address(specified in %NL80211_ATTR_MAC).

 *

 * @NL80211_CMD_MAX: highest used command number

 * @__NL80211_CMD_AFTER_LAST: internal use
@@ -2218,7 +2218,7 @@ enum nl80211_commands { 
 * @NL80211_ATTR_EXTERNAL_AUTH_ACTION: Identify the requested external

 *     authentication operation (u32 attribute with an

 *     &enum nl80211_external_auth_action value). This is used with the

 *     &NL80211_CMD_EXTERNAL_AUTH request event.

 *     %NL80211_CMD_EXTERNAL_AUTH request event.

 * @NL80211_ATTR_EXTERNAL_AUTH_SUPPORT: Flag attribute indicating that the user

 *     space supports external authentication. This attribute shall be used

 *     only with %NL80211_CMD_CONNECT request. The driver may offload
@@ -3491,7 +3491,7 @@ enum nl80211_sched_scan_match_attr { 
 * @NL80211_RRF_AUTO_BW: maximum available bandwidth should be calculated

 *	base on contiguous rules and wider channels will be allowed to cross

 *	multiple contiguous/overlapping frequency ranges.

 * @NL80211_RRF_IR_CONCURRENT: See &NL80211_FREQUENCY_ATTR_IR_CONCURRENT

 * @NL80211_RRF_IR_CONCURRENT: See %NL80211_FREQUENCY_ATTR_IR_CONCURRENT

 * @NL80211_RRF_NO_HT40MINUS: channels can't be used in HT40- operation

 * @NL80211_RRF_NO_HT40PLUS: channels can't be used in HT40+ operation

 * @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed
@@ -5643,11 +5643,11 @@ enum nl80211_nan_func_attributes { 
 * @NL80211_NAN_SRF_INCLUDE: present if the include bit of the SRF set.

 *	This is a flag.

 * @NL80211_NAN_SRF_BF: Bloom Filter. Present if and only if

 *	&NL80211_NAN_SRF_MAC_ADDRS isn't present. This attribute is binary.

 *	%NL80211_NAN_SRF_MAC_ADDRS isn't present. This attribute is binary.

 * @NL80211_NAN_SRF_BF_IDX: index of the Bloom Filter. Mandatory if

 *	&NL80211_NAN_SRF_BF is present. This is a u8.

 *	%NL80211_NAN_SRF_BF is present. This is a u8.

 * @NL80211_NAN_SRF_MAC_ADDRS: list of MAC addresses for the SRF. Present if

 *	and only if &NL80211_NAN_SRF_BF isn't present. This is a nested

 *	and only if %NL80211_NAN_SRF_BF isn't present. This is a nested

 *	attribute. Each nested attribute is a MAC address.

 * @NUM_NL80211_NAN_SRF_ATTR: internal

 * @NL80211_NAN_SRF_ATTR_MAX: highest NAN SRF attribute

net/mac80211/main.c

+6 −6
Original line number Diff line number Diff line
@@ -1098,6 +1098,10 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 


	ieee80211_led_init(local);



	result = ieee80211_txq_setup_flows(local);

	if (result)

		goto fail_flows;



	rtnl_lock();



	result = ieee80211_init_rate_ctrl_alg(local,
@@ -1120,10 +1124,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 


	rtnl_unlock();



	result = ieee80211_txq_setup_flows(local);

	if (result)

		goto fail_flows;



#ifdef CONFIG_INET

	local->ifa_notifier.notifier_call = ieee80211_ifa_changed;

	result = register_inetaddr_notifier(&local->ifa_notifier);
@@ -1149,8 +1149,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
#if defined(CONFIG_INET) || defined(CONFIG_IPV6)

 fail_ifa:

#endif

	ieee80211_txq_teardown_flows(local);

 fail_flows:

	rtnl_lock();

	rate_control_deinitialize(local);

	ieee80211_remove_interfaces(local);
@@ -1158,6 +1156,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
	rtnl_unlock();

	ieee80211_led_exit(local);

	ieee80211_wep_free(local);

	ieee80211_txq_teardown_flows(local);

 fail_flows:

	destroy_workqueue(local->workqueue);

 fail_workqueue:

	wiphy_unregister(local->hw.wiphy);

net/wireless/core.c

+1 −0
Original line number Diff line number Diff line
@@ -1012,6 +1012,7 @@ void cfg80211_unregister_wdev(struct wireless_dev *wdev) 
	nl80211_notify_iface(rdev, wdev, NL80211_CMD_DEL_INTERFACE);



	list_del_rcu(&wdev->list);

	synchronize_rcu();

	rdev->devlist_generation++;



	switch (wdev->iftype) {

net/wireless/util.c

+2 −0
Original line number Diff line number Diff line
@@ -1746,6 +1746,8 @@ int cfg80211_get_station(struct net_device *dev, const u8 *mac_addr, 
	if (!rdev->ops->get_station)

		return -EOPNOTSUPP;



	memset(sinfo, 0, sizeof(*sinfo));



	return rdev_get_station(rdev, dev, mac_addr, sinfo);

}

EXPORT_SYMBOL(cfg80211_get_station);