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

Commit 8646224c authored May 24, 2014 by David S. Miller

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless



John W. Linville says:

====================
pull request: wireless 2014-05-23

I have two more fixes intended for the 3.15 stream...

For the iwlwifi one, Emmanuel says:

"A race has been discovered in the beacon filtering code. Since the
fix is too big for 3.15, I disable here the feature."

For the bluetooth one, Gustavo says:

"This pull request contains a very important fix for 3.15. Here we fix the
permissions of a debugfs file that would otherwise allow unauthorized users
to write content to it."

Please let me know if there are problems!
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 7df566bb 5ca2504e

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -826,7 +826,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
		if (ret)
		goto out_remove_mac;

		if (!mvm->bf_allowed_vif &&
		if (!mvm->bf_allowed_vif && false &&
		vif->type == NL80211_IFTYPE_STATION && !vif->p2p &&
		mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BF_UPDATED){
		mvm->bf_allowed_vif = mvmvif;

net/bluetooth/l2cap_core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -7519,9 +7519,9 @@ int __init l2cap_init(void)
		l2cap_debugfs = debugfs_create_file("l2cap", 0444, bt_debugfs,
		NULL, &l2cap_debugfs_fops);

		debugfs_create_u16("l2cap_le_max_credits", 0466, bt_debugfs,
		debugfs_create_u16("l2cap_le_max_credits", 0644, bt_debugfs,
		&le_max_credits);
		debugfs_create_u16("l2cap_le_default_mps", 0466, bt_debugfs,
		debugfs_create_u16("l2cap_le_default_mps", 0644, bt_debugfs,
		&le_default_mps);

		bt_6lowpan_init();