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/607-rt2x00-add_platform_data_mac_addr.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/607-rt2x00-add_platform_data_mac_addr.patch')
-rw-r--r-- | package/kernel/mac80211/patches/607-rt2x00-add_platform_data_mac_addr.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/607-rt2x00-add_platform_data_mac_addr.patch b/package/kernel/mac80211/patches/607-rt2x00-add_platform_data_mac_addr.patch index 5a3f858090..bca7be8533 100644 --- a/package/kernel/mac80211/patches/607-rt2x00-add_platform_data_mac_addr.patch +++ b/package/kernel/mac80211/patches/607-rt2x00-add_platform_data_mac_addr.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -@@ -929,8 +929,13 @@ static void rt2x00lib_rate(struct ieee80 +@@ -1001,8 +1001,13 @@ static void rt2x00lib_rate(struct ieee80 void rt2x00lib_set_mac_address(struct rt2x00_dev *rt2x00dev, u8 *eeprom_mac_addr) { |