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-05-rt2x00-rt2800lib-add-channel-configuration-function-.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-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch')
-rw-r--r-- | package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch b/package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch index a1e5883035..afcb6bdf4a 100644 --- a/package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch +++ b/package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch @@ -11,7 +11,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 -@@ -2584,6 +2584,211 @@ static void rt2800_config_channel_rf3053 +@@ -2709,6 +2709,211 @@ static void rt2800_config_channel_rf3053 } } @@ -223,7 +223,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> #define POWER_BOUND 0x27 #define POWER_BOUND_5G 0x2b -@@ -3203,6 +3408,9 @@ static void rt2800_config_channel(struct +@@ -3565,6 +3770,9 @@ static void rt2800_config_channel(struct case RF3322: rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info); break; |