mac80211: Update to version 5.2-rc7

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / rt2x00 / 607-rt2x00-add_platform_data_mac_addr.patch

diff --git a/package/kernel/mac80211/patches/rt2x00/607-rt2x00-add_platform_data_mac_addr.patch b/package/kernel/mac80211/patches/rt2x00/607-rt2x00-add_platform_data_mac_addr.patch
index b8b018804000577990d45c76e3576208c80d7471..f694b061d8e09277e5fe635efcadbb05c982d240 100644 (file)
--- a/package/kernel/mac80211/patches/rt2x00/607-rt2x00-add_platform_data_mac_addr.patch
+++ b/package/kernel/mac80211/patches/rt2x00/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
-@@ -1004,8 +1004,13 @@ static void rt2x00lib_rate(struct ieee80
+@@ -993,8 +993,13 @@ static void rt2x00lib_rate(struct ieee80
  
  void rt2x00lib_set_mac_address(struct rt2x00_dev *rt2x00dev, u8 *eeprom_mac_addr)
  {
@@ -12,7 +12,7 @@
 +              ether_addr_copy(eeprom_mac_addr, pdata->mac_address);
 +
        mac_addr = of_get_mac_address(rt2x00dev->dev->of_node);
-       if (mac_addr)
+       if (!IS_ERR(mac_addr))
                ether_addr_copy(eeprom_mac_addr, mac_addr);
 --- a/include/linux/rt2x00_platform.h
 +++ b/include/linux/rt2x00_platform.h