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

Commit e8986436 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

mac80211: make minstrel/pid RC use ieee80211_is_data(fc) 



Cc: Felix Fietkau <nbd@openwrt.org>
Cc: Derek Smithies <derek@indranet.co.nz>
Cc: Chittajit Mitra <Chittajit.Mitra@Atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7682a76d

net/mac80211/rc80211_minstrel.c

+3 −4
Original line number Diff line number Diff line
@@ -75,12 +75,11 @@ use_low_rate(struct sk_buff *skb) 
{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	u16 fc;

	__le16 fc;



	fc = le16_to_cpu(hdr->frame_control);

	fc = hdr->frame_control;



	return ((info->flags & IEEE80211_TX_CTL_NO_ACK) ||

		(fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA);

	return ((info->flags & IEEE80211_TX_CTL_NO_ACK) || !ieee80211_is_data(fc));

}

net/mac80211/rc80211_pid_algo.c

+3 −4
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ rate_control_pid_get_rate(void *priv, struct ieee80211_sta *sta, 
	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct rc_pid_sta_info *spinfo = priv_sta;

	int rateidx;

	u16 fc;

	__le16 fc;



	if (txrc->rts)

		info->control.rates[0].count =
@@ -290,9 +290,8 @@ rate_control_pid_get_rate(void *priv, struct ieee80211_sta *sta, 
			txrc->hw->conf.short_frame_max_tx_count;



	/* Send management frames and NO_ACK data using lowest rate. */

	fc = le16_to_cpu(hdr->frame_control);

	if (!sta || !spinfo ||

	    (fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA ||

	fc = hdr->frame_control;

	if (!sta || !spinfo || !ieee80211_is_data(fc) ||

	    info->flags & IEEE80211_TX_CTL_NO_ACK) {

		info->control.rates[0].idx = rate_lowest_index(sband, sta);

		if (info->flags & IEEE80211_TX_CTL_NO_ACK)