diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-04-14 13:47:01 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-04-14 13:47:01 -0400 |
| commit | 08e22e193a0080d53dd0669c4f6422f602bb643c (patch) | |
| tree | b85c76ba6466fce48bbce4500d49f142aa0bf263 /net/mac80211/status.c | |
| parent | 321d03c86732e45f5f33ad0db5b68e2e1364acb9 (diff) | |
| parent | 764152ff66f4a8be1f9d7981e542ffdaa5bd7aff (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/mac80211/status.c')
| -rw-r--r-- | net/mac80211/status.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index e6e574a307c8..00ba90b02ab2 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c | |||
| @@ -618,6 +618,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
| 618 | sta, true, acked); | 618 | sta, true, acked); |
| 619 | 619 | ||
| 620 | if ((local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) && | 620 | if ((local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) && |
| 621 | (ieee80211_is_data(hdr->frame_control)) && | ||
| 621 | (rates_idx != -1)) | 622 | (rates_idx != -1)) |
| 622 | sta->last_tx_rate = info->status.rates[rates_idx]; | 623 | sta->last_tx_rate = info->status.rates[rates_idx]; |
| 623 | 624 | ||