mac80211: update to wireless-testing 2010-05-12 plus some pending patches

[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 c414951..946dda5 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,30 +1,28 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c

-@@ -15,6 +15,7 @@
-  */
+@@ -16,6 +16,7 @@

  
  #include <linux/io.h>
  
  #include <linux/io.h>

+ #include <linux/slab.h>

 +#include <linux/etherdevice.h>
  #include <asm/unaligned.h>
  
  #include "hw.h"
 +#include <linux/etherdevice.h>
  #include <asm/unaligned.h>
  
  #include "hw.h"

-@@ -437,8 +438,18 @@ static int ath9k_hw_init_macaddr(struct 
+@@ -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)
 -              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)) {

-+              DECLARE_MAC_BUF(macbuf);
-+

 +              ath_print(common, ATH_DBG_EEPROM,
 +              ath_print(common, ATH_DBG_EEPROM,

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

 +
 +              random_ether_addr(common->macaddr);
 +              ath_print(common, ATH_DBG_EEPROM,
 +
 +              random_ether_addr(common->macaddr);
 +              ath_print(common, ATH_DBG_EEPROM,

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

 +      }
  
        return 0;
 +      }
  
        return 0;