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

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

Merge tag 'mac80211-for-davem-2018-02-22' of... 

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



Johannes Berg says:

====================
Various fixes across the tree, the shortlog basically says it all:

  cfg80211: fix cfg80211_beacon_dup
  -> old bug in this code

  cfg80211: clear wep keys after disconnection
  -> certain ways of disconnecting left the keys

  mac80211: round IEEE80211_TX_STATUS_HEADROOM up to multiple of 4
  -> alignment issues with using 14 bytes

  mac80211: Do not disconnect on invalid operating class
  -> if the AP has a bogus operating class, let it be

  mac80211: Fix sending ADDBA response for an ongoing session
  -> don't send the same frame twice

  cfg80211: use only 1Mbps for basic rates in mesh
  -> interop issue with old versions of our code

  mac80211_hwsim: don't use WQ_MEM_RECLAIM
  -> it causes splats because it flushes work on a non-reclaim WQ

  regulatory: add NUL to request alpha2
  -> nla_put_string() issue from Kees

  mac80211: mesh: fix wrong mesh TTL offset calculation
  -> protocol issue

  mac80211: fix a possible leak of station stats
  -> error path might leak memory

  mac80211: fix calling sleeping function in atomic context
  -> percpu allocations need to be made with gfp flags
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a2c0f039 657308f7

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -3516,7 +3516,7 @@ static int __init init_mac80211_hwsim(void) 


	spin_lock_init(&hwsim_radio_lock);



	hwsim_wq = alloc_workqueue("hwsim_wq",WQ_MEM_RECLAIM,0);

	hwsim_wq = alloc_workqueue("hwsim_wq", 0, 0);

	if (!hwsim_wq)

		return -ENOMEM;

	rhashtable_init(&hwsim_radios_rht, &hwsim_rht_params);

include/net/mac80211.h

+1 −1
Original line number Diff line number Diff line
@@ -4149,7 +4149,7 @@ void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *sta, u8 tid); 
 * The TX headroom reserved by mac80211 for its own tx_status functions.

 * This is enough for the radiotap header.

 */

#define IEEE80211_TX_STATUS_HEADROOM	14

#define IEEE80211_TX_STATUS_HEADROOM	ALIGN(14, 4)



/**

 * ieee80211_sta_set_buffered - inform mac80211 about driver-buffered frames

include/net/regulatory.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct regulatory_request { 
	int wiphy_idx;

	enum nl80211_reg_initiator initiator;

	enum nl80211_user_reg_hint_type user_reg_hint_type;

	char alpha2[2];

	char alpha2[3];

	enum nl80211_dfs_regions dfs_region;

	bool intersect;

	bool processed;

net/mac80211/agg-rx.c

+1 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright 2007, Michael Wu <flamingice@sourmilk.net>

 * Copyright 2007-2010, Intel Corporation

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018        Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -304,9 +305,6 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta, 
			 * driver so reject the timeout update.

			 */

			status = WLAN_STATUS_REQUEST_DECLINED;

			ieee80211_send_addba_resp(sta->sdata, sta->sta.addr,

						  tid, dialog_token, status,

						  1, buf_size, timeout);

			goto end;

		}

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -2892,7 +2892,7 @@ cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon) 
	}

	if (beacon->probe_resp_len) {

		new_beacon->probe_resp_len = beacon->probe_resp_len;

		beacon->probe_resp = pos;

		new_beacon->probe_resp = pos;

		memcpy(pos, beacon->probe_resp, beacon->probe_resp_len);

		pos += beacon->probe_resp_len;

	}