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

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

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 5e2a911c 5affcd6b

drivers/net/wireless/iwlwifi/iwl-rx.c

+4 −1
Original line number Diff line number Diff line
@@ -928,7 +928,10 @@ static void iwl_pass_packet_to_mac80211(struct iwl_priv *priv, 
	if (ieee80211_is_mgmt(fc) ||

	    ieee80211_has_protected(fc) ||

	    ieee80211_has_morefrags(fc) ||

	    le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG)

	    le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG ||

	    (ieee80211_is_data_qos(fc) &&

	     *ieee80211_get_qos_ctl(hdr) &

	     IEEE80211_QOS_CONTROL_A_MSDU_PRESENT))

		ret = skb_linearize(skb);

	else

		ret = __pskb_pull_tail(skb, min_t(u16, IWL_LINK_HDR_MAX, len)) ?

net/mac80211/rate.c

+3 −0
Original line number Diff line number Diff line
@@ -245,6 +245,9 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata, 
		info->control.rates[i].count = 1;

	}



	if (sdata->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)

		return;



	if (sta && sdata->force_unicast_rateidx > -1) {

		info->control.rates[0].idx = sdata->force_unicast_rateidx;

	} else {