diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-09-23 18:02:35 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-09-26 16:39:44 +0200 |
| commit | db90c243a0b9bd72fc691cd09e58a96ac2a452cf (patch) | |
| tree | 50896a95c2bb146907b5d40bb561d541994cade0 /package/kernel/mac80211/patches/rt2x00/704-rt2x00-use-different-txstatus-timeouts-when-flushing.patch | |
| parent | 61b5b4971e7d6aab6b0695997c3b5aaf73c53b5f (diff) | |
| download | upstream-db90c243a0b9bd72fc691cd09e58a96ac2a452cf.tar.gz upstream-db90c243a0b9bd72fc691cd09e58a96ac2a452cf.tar.bz2 upstream-db90c243a0b9bd72fc691cd09e58a96ac2a452cf.zip | |
mac80211: update to version based on 4.19-rc4
This updates mac80211 to backports based on kernel 4.19-rc4.
I plan to integrate all the patches which are in this tar into upstream
backports soon.
I used the backports generated from this code:
https://github.com/hauke/backports/commits/wip2
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/rt2x00/704-rt2x00-use-different-txstatus-timeouts-when-flushing.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/rt2x00/704-rt2x00-use-different-txstatus-timeouts-when-flushing.patch | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/package/kernel/mac80211/patches/rt2x00/704-rt2x00-use-different-txstatus-timeouts-when-flushing.patch b/package/kernel/mac80211/patches/rt2x00/704-rt2x00-use-different-txstatus-timeouts-when-flushing.patch index ce733c949a..6c4d42b6f1 100644 --- a/package/kernel/mac80211/patches/rt2x00/704-rt2x00-use-different-txstatus-timeouts-when-flushing.patch +++ b/package/kernel/mac80211/patches/rt2x00/704-rt2x00-use-different-txstatus-timeouts-when-flushing.patch @@ -16,11 +16,9 @@ Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> .../net/wireless/ralink/rt2x00/rt2x00mac.c | 4 +++ 3 files changed, 26 insertions(+), 10 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index 0c56c7dca55f..595cb9c90b81 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -1137,36 +1137,47 @@ void rt2800_txdone(struct rt2x00_dev *rt2x00dev) +@@ -1140,36 +1140,47 @@ void rt2800_txdone(struct rt2x00_dev *rt } EXPORT_SYMBOL_GPL(rt2800_txdone); @@ -77,7 +75,7 @@ index 0c56c7dca55f..595cb9c90b81 100644 return true; } -@@ -1195,7 +1206,7 @@ void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev) +@@ -1198,7 +1209,7 @@ void rt2800_txdone_nostatus(struct rt2x0 break; if (test_bit(ENTRY_DATA_IO_FAILED, &entry->flags) || @@ -86,11 +84,9 @@ index 0c56c7dca55f..595cb9c90b81 100644 rt2x00lib_txdone_noinfo(entry, TXDONE_FAILURE); else break; -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h -index af062cda4a23..4b1744e9fb78 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h -@@ -665,6 +665,7 @@ enum rt2x00_state_flags { +@@ -667,6 +667,7 @@ enum rt2x00_state_flags { DEVICE_STATE_STARTED, DEVICE_STATE_ENABLED_RADIO, DEVICE_STATE_SCANNING, @@ -98,11 +94,9 @@ index af062cda4a23..4b1744e9fb78 100644 /* * Driver configuration -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c -index fa2fd64084ac..2825560e2424 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c -@@ -720,8 +720,12 @@ void rt2x00mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, +@@ -720,8 +720,12 @@ void rt2x00mac_flush(struct ieee80211_hw if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags)) return; @@ -115,6 +109,3 @@ index fa2fd64084ac..2825560e2424 100644 } EXPORT_SYMBOL_GPL(rt2x00mac_flush); --- -2.18.0 - |