diff options
author | Daniel Golle <daniel@makrotopia.org> | 2017-03-30 18:08:49 +0200 |
---|---|---|
committer | Jo-Philipp Wich <jo@mein.io> | 2017-05-02 23:17:22 +0200 |
commit | 5b91d2b52ed0d31e6ca6990ca01923e3a3d1d217 (patch) | |
tree | 365dbcbc0e6a24f69a77696bff019e07cbdda28c /package/kernel/mac80211/patches/600-23-rt2x00-rt2800mmio-add-a-workaround-for-spurious-TX_F.patch | |
parent | ab7087e24f9ea37e126d71de27fae8a3a5af2caf (diff) | |
download | upstream-5b91d2b52ed0d31e6ca6990ca01923e3a3d1d217.tar.gz upstream-5b91d2b52ed0d31e6ca6990ca01923e3a3d1d217.tar.bz2 upstream-5b91d2b52ed0d31e6ca6990ca01923e3a3d1d217.zip |
mac80211: rt2x00: import upstream changes and rebase our patches
Some of our local patches have been accepted upstream. And there are
some more relevant changes (mostly for rt2800usb). Import them and
rebase our remaining local patches on top.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/kernel/mac80211/patches/600-23-rt2x00-rt2800mmio-add-a-workaround-for-spurious-TX_F.patch')
-rw-r--r-- | package/kernel/mac80211/patches/600-23-rt2x00-rt2800mmio-add-a-workaround-for-spurious-TX_F.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/600-23-rt2x00-rt2800mmio-add-a-workaround-for-spurious-TX_F.patch b/package/kernel/mac80211/patches/600-23-rt2x00-rt2800mmio-add-a-workaround-for-spurious-TX_F.patch index a6dc6a6afb..7d8d2f5e13 100644 --- a/package/kernel/mac80211/patches/600-23-rt2x00-rt2800mmio-add-a-workaround-for-spurious-TX_F.patch +++ b/package/kernel/mac80211/patches/600-23-rt2x00-rt2800mmio-add-a-workaround-for-spurious-TX_F.patch @@ -122,7 +122,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> */ --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h -@@ -999,6 +999,11 @@ struct rt2x00_dev { +@@ -1000,6 +1000,11 @@ struct rt2x00_dev { int rf_channel; /* |