diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-06-10 15:30:31 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-06-17 11:51:41 +0200 |
| commit | 45572fe831f94654af35316a365c51eb8a9cdeb8 (patch) | |
| tree | a272e99019d5fd64d063ef48594b5f53bee204e1 /package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch | |
| parent | 189239ade353636f9e2788cd0467bcca97bb9324 (diff) | |
| download | upstream-45572fe831f94654af35316a365c51eb8a9cdeb8.tar.gz upstream-45572fe831f94654af35316a365c51eb8a9cdeb8.tar.bz2 upstream-45572fe831f94654af35316a365c51eb8a9cdeb8.zip | |
mac80211: refresh patches
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch b/package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch index bb35f2d300..a0cc37f491 100644 --- a/package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch +++ b/package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch @@ -13,11 +13,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -index 90fc259fb5bc..e95d2aad3b3f 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -@@ -357,6 +357,9 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev, +@@ -357,6 +357,9 @@ static void rt2x00lib_fill_tx_status(str if (i < (IEEE80211_TX_MAX_RATES - 1)) tx_info->status.rates[i].idx = -1; /* terminate */ @@ -27,7 +25,7 @@ index 90fc259fb5bc..e95d2aad3b3f 100644 if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK)) { if (success) tx_info->flags |= IEEE80211_TX_STAT_ACK; -@@ -375,7 +378,8 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev, +@@ -375,7 +378,8 @@ static void rt2x00lib_fill_tx_status(str */ if (test_bit(TXDONE_AMPDU, &txdesc->flags) || tx_info->flags & IEEE80211_TX_CTL_AMPDU) { @@ -37,8 +35,6 @@ index 90fc259fb5bc..e95d2aad3b3f 100644 tx_info->status.ampdu_len = 1; tx_info->status.ampdu_ack_len = success ? 1 : 0; -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h -index 9b297fce4692..c78fb8c8838a 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h @@ -215,6 +215,7 @@ enum txdone_entry_desc_flags { @@ -49,6 +45,3 @@ index 9b297fce4692..c78fb8c8838a 100644 }; /** --- -2.12.1 - |