[backfire] backport mac80211 and hostapd from trunk

[openwrt-10.03/.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 34239992618e66fecaaf69a05a94fa8de89a7954..946dda567ee64900bacaac69cfd161aeb0322c1e 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
@@ -1,25 +1,29 @@
---- a/drivers/net/wireless/ath9k/hw.c
-+++ b/drivers/net/wireless/ath9k/hw.c
-@@ -493,11 +493,18 @@ static int ath9k_hw_init_macaddr(struct 
-               ah->macaddr[2 * i] = eeval >> 8;
-               ah->macaddr[2 * i + 1] = eeval & 0xff;
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -16,6 +16,7 @@
+ 
+ #include <linux/io.h>
+ #include <linux/slab.h>
++#include <linux/etherdevice.h>
+ #include <asm/unaligned.h>
+ 
+ #include "hw.h"
+@@ -456,8 +457,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) {
-+
-+      if (!is_valid_ether_addr(ah->macaddr)) {
-+              DECLARE_MAC_BUF(macbuf);
-+
-+              DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
-+                      "eeprom contains invalid mac address: %s\n",
-+                      print_mac(macbuf, ah->macaddr));
-+
-+              random_ether_addr(ah->macaddr);
-               DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
--                      "mac address read failed: %pM\n",
--                      ah->macaddr);
+-      if (sum == 0 || sum == 0xffff * 3)
 -              return -EADDRNOTAVAIL;
-+                      "random mac address will be used: %s\n",
-+                      print_mac(macbuf, ah->macaddr));
-       }
++      if (!is_valid_ether_addr(common->macaddr)) {
++              ath_print(common, ATH_DBG_EEPROM,
++                      "eeprom contains invalid mac address: %pM\n",
++                      common->macaddr);
++
++              random_ether_addr(common->macaddr);
++              ath_print(common, ATH_DBG_EEPROM,
++                      "random mac address will be used: %pM\n",
++                      common->macaddr);
++      }
  
        return 0;
+ }