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

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

Merge tag 'mac80211-for-davem-2015-02-27' of... 

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



Johannes Berg says:

====================
A few patches have accumulated, among them the fix for Linus's
four-way-handshake problem. The others are various small fixes
for problems all over, nothing really stands out.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 06615bed 9c1c98a3

drivers/net/wireless/mac80211_hwsim.c

+4 −1
Original line number Diff line number Diff line
@@ -946,7 +946,8 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, 
		goto nla_put_failure;



	genlmsg_end(skb, msg_head);

	genlmsg_unicast(&init_net, skb, dst_portid);

	if (genlmsg_unicast(&init_net, skb, dst_portid))

		goto err_free_txskb;



	/* Enqueue the packet */

	skb_queue_tail(&data->pending, my_skb);
@@ -955,6 +956,8 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, 
	return;



nla_put_failure:

	nlmsg_free(skb);

err_free_txskb:

	printk(KERN_DEBUG "mac80211_hwsim: error occurred in %s\n", __func__);

	ieee80211_free_txskb(hw, my_skb);

	data->tx_failed++;

net/mac80211/chan.c

+5 −0
Original line number Diff line number Diff line
@@ -1508,6 +1508,8 @@ static void __ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata) 
	if (ieee80211_chanctx_refcount(local, ctx) == 0)

		ieee80211_free_chanctx(local, ctx);



	sdata->radar_required = false;



	/* Unreserving may ready an in-place reservation. */

	if (use_reserved_switch)

		ieee80211_vif_use_reserved_switch(local);
@@ -1566,6 +1568,9 @@ int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata, 
	ieee80211_recalc_smps_chanctx(local, ctx);

	ieee80211_recalc_radar_chanctx(local, ctx);

 out:

	if (ret)

		sdata->radar_required = false;



	mutex_unlock(&local->chanctx_mtx);

	return ret;

}

net/mac80211/rc80211_minstrel.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta, 
		rate++;

		mi->sample_deferred++;

	} else {

		if (!msr->sample_limit != 0)

		if (!msr->sample_limit)

			return;



		mi->sample_packets++;

net/mac80211/tx.c

+1 −0
Original line number Diff line number Diff line
@@ -566,6 +566,7 @@ ieee80211_tx_h_check_control_port_protocol(struct ieee80211_tx_data *tx) 
		if (tx->sdata->control_port_no_encrypt)

			info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;

		info->control.flags |= IEEE80211_TX_CTRL_PORT_CTRL_PROTO;

		info->flags |= IEEE80211_TX_CTL_USE_MINRATE;

	}



	return TX_CONTINUE;

net/wireless/core.c

+1 −0
Original line number Diff line number Diff line
@@ -1199,6 +1199,7 @@ out_fail_wq: 
	regulatory_exit();

out_fail_reg:

	debugfs_remove(ieee80211_debugfs_dir);

	nl80211_exit();

out_fail_nl80211:

	unregister_netdevice_notifier(&cfg80211_netdev_notifier);

out_fail_notifier: