Commit 64d47902 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2018-12-05' of... 

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



Johannes Berg:

====================
As it's been a while, we have various fixes for
 * hwsim
 * AP mode (client powersave related)
 * CSA/FTM interaction
 * a busy loop in IE handling
 * and similar
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0fb628f0 312ca38d

drivers/net/wireless/mac80211_hwsim.c

+11 −9
Original line number Diff line number Diff line
@@ -2884,6 +2884,10 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 


	wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);



	tasklet_hrtimer_init(&data->beacon_timer,

			     mac80211_hwsim_beacon,

			     CLOCK_MONOTONIC, HRTIMER_MODE_ABS);



	err = ieee80211_register_hw(hw);

	if (err < 0) {

		pr_debug("mac80211_hwsim: ieee80211_register_hw failed (%d)\n",
@@ -2908,10 +2912,6 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
				    data->debugfs,

				    data, &hwsim_simulate_radar);



	tasklet_hrtimer_init(&data->beacon_timer,

			     mac80211_hwsim_beacon,

			     CLOCK_MONOTONIC, HRTIMER_MODE_ABS);



	spin_lock_bh(&hwsim_radio_lock);

	err = rhashtable_insert_fast(&hwsim_radios_rht, &data->rht,

				     hwsim_rht_params);
@@ -3703,16 +3703,16 @@ static int __init init_mac80211_hwsim(void) 
	if (err)

		goto out_unregister_pernet;



	err = hwsim_init_netlink();

	if (err)

		goto out_unregister_driver;



	hwsim_class = class_create(THIS_MODULE, "mac80211_hwsim");

	if (IS_ERR(hwsim_class)) {

		err = PTR_ERR(hwsim_class);

		goto out_unregister_driver;

		goto out_exit_netlink;

	}



	err = hwsim_init_netlink();

	if (err < 0)

		goto out_unregister_driver;



	for (i = 0; i < radios; i++) {

		struct hwsim_new_radio_params param = { 0 };
@@ -3818,6 +3818,8 @@ out_free_mon: 
	free_netdev(hwsim_mon);

out_free_radios:

	mac80211_hwsim_free();

out_exit_netlink:

	hwsim_exit_netlink();

out_unregister_driver:

	platform_driver_unregister(&mac80211_hwsim_driver);

out_unregister_pernet:

net/mac80211/cfg.c

+4 −3
Original line number Diff line number Diff line
@@ -2891,7 +2891,7 @@ cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon) 


	len = beacon->head_len + beacon->tail_len + beacon->beacon_ies_len +

	      beacon->proberesp_ies_len + beacon->assocresp_ies_len +

	      beacon->probe_resp_len;

	      beacon->probe_resp_len + beacon->lci_len + beacon->civicloc_len;



	new_beacon = kzalloc(sizeof(*new_beacon) + len, GFP_KERNEL);

	if (!new_beacon)
@@ -2934,7 +2934,8 @@ cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon) 
		memcpy(pos, beacon->probe_resp, beacon->probe_resp_len);

		pos += beacon->probe_resp_len;

	}

	if (beacon->ftm_responder)



	/* might copy -1, meaning no changes requested */

	new_beacon->ftm_responder = beacon->ftm_responder;

	if (beacon->lci) {

		new_beacon->lci_len = beacon->lci_len;

net/mac80211/iface.c

+2 −0
Original line number Diff line number Diff line
@@ -1015,6 +1015,8 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
	if (local->open_count == 0)

		ieee80211_clear_tx_pending(local);



	sdata->vif.bss_conf.beacon_int = 0;



	/*

	 * If the interface goes down while suspended, presumably because

	 * the device was unplugged and that happens before our resume,

net/mac80211/mlme.c

+8 −4
Original line number Diff line number Diff line
@@ -2766,6 +2766,7 @@ static bool ieee80211_mark_sta_auth(struct ieee80211_sub_if_data *sdata, 
{

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	struct sta_info *sta;

	bool result = true;



	sdata_info(sdata, "authenticated\n");

	ifmgd->auth_data->done = true;
@@ -2778,15 +2779,18 @@ static bool ieee80211_mark_sta_auth(struct ieee80211_sub_if_data *sdata, 
	sta = sta_info_get(sdata, bssid);

	if (!sta) {

		WARN_ONCE(1, "%s: STA %pM not found", sdata->name, bssid);

		return false;

		result = false;

		goto out;

	}

	if (sta_info_move_state(sta, IEEE80211_STA_AUTH)) {

		sdata_info(sdata, "failed moving %pM to auth\n", bssid);

		return false;

		result = false;

		goto out;

	}

	mutex_unlock(&sdata->local->sta_mtx);



	return true;

out:

	mutex_unlock(&sdata->local->sta_mtx);

	return result;

}



static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,

net/mac80211/rx.c

+3 −2
Original line number Diff line number Diff line
@@ -1403,6 +1403,7 @@ ieee80211_rx_h_check_dup(struct ieee80211_rx_data *rx) 
		return RX_CONTINUE;



	if (ieee80211_is_ctl(hdr->frame_control) ||

	    ieee80211_is_nullfunc(hdr->frame_control) ||

	    ieee80211_is_qos_nullfunc(hdr->frame_control) ||

	    is_multicast_ether_addr(hdr->addr1))

		return RX_CONTINUE;
@@ -3063,7 +3064,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) 
			cfg80211_sta_opmode_change_notify(sdata->dev,

							  rx->sta->addr,

							  &sta_opmode,

							  GFP_KERNEL);

							  GFP_ATOMIC);

			goto handled;

		}

		case WLAN_HT_ACTION_NOTIFY_CHANWIDTH: {
@@ -3100,7 +3101,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) 
			cfg80211_sta_opmode_change_notify(sdata->dev,

							  rx->sta->addr,

							  &sta_opmode,

							  GFP_KERNEL);

							  GFP_ATOMIC);

			goto handled;

		}

		default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE