ath5k: fix a crash when setting coverage class before the first channel change (...

[openwrt.git] / package / mac80211 / patches / 403-ath9k-fix-invalid-mac-address-handling.patch

diff --git a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
index c9839c1..767f905 100644 (file)
--- a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
+++ b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
@@ -8,19 +8,19 @@
  #include <asm/unaligned.h>
  
  #include "hw.h"
  #include <asm/unaligned.h>
  
  #include "hw.h"

-@@ -445,8 +446,16 @@ static int ath9k_hw_init_macaddr(struct 
+@@ -443,8 +444,16 @@ static int ath9k_hw_init_macaddr(struct 

                common->macaddr[2 * i] = eeval >> 8;
                common->macaddr[2 * i + 1] = eeval & 0xff;
        }
 -      if (sum == 0 || sum == 0xffff * 3)
 -              return -EADDRNOTAVAIL;
 +      if (!is_valid_ether_addr(common->macaddr)) {
                common->macaddr[2 * i] = eeval >> 8;
                common->macaddr[2 * i + 1] = eeval & 0xff;
        }
 -      if (sum == 0 || sum == 0xffff * 3)
 -              return -EADDRNOTAVAIL;
 +      if (!is_valid_ether_addr(common->macaddr)) {

-+              ath_print(common, ATH_DBG_EEPROM,
++              ath_err(common,

 +                      "eeprom contains invalid mac address: %pM\n",
 +                      common->macaddr);
 +
 +              random_ether_addr(common->macaddr);
 +                      "eeprom contains invalid mac address: %pM\n",
 +                      common->macaddr);
 +
 +              random_ether_addr(common->macaddr);

-+              ath_print(common, ATH_DBG_EEPROM,
++              ath_err(common,

 +                      "random mac address will be used: %pM\n",
 +                      common->macaddr);
 +      }
 +                      "random mac address will be used: %pM\n",
 +                      common->macaddr);
 +      }