diff options
author | Daniel Golle <daniel@makrotopia.org> | 2017-03-30 18:08:49 +0200 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2017-03-30 18:31:02 +0200 |
commit | 399d5cf532bc546a1a15c232fef06d6e9fd90228 (patch) | |
tree | 203a82c56a5cc1eda38b3fa5d943cf6caced7919 /package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch | |
parent | dc4eae7a8cf676911b0048b1e73c6f9adeea2f06 (diff) | |
download | upstream-399d5cf532bc546a1a15c232fef06d6e9fd90228.tar.gz upstream-399d5cf532bc546a1a15c232fef06d6e9fd90228.tar.bz2 upstream-399d5cf532bc546a1a15c232fef06d6e9fd90228.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-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch')
-rw-r--r-- | package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch b/package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch index f18f9d5714..3412a3e133 100644 --- a/package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch +++ b/package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -3358,13 +3358,15 @@ static char rt2800_txpower_to_dev(struct +@@ -3720,13 +3720,15 @@ static char rt2800_txpower_to_dev(struct unsigned int channel, char txpower) { |