mac80211: move the 2.6.30 compat patch to the other compat 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 2a1763a..bb3796a 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,31 @@
---- a/drivers/net/wireless/ath9k/hw.c
-+++ b/drivers/net/wireless/ath9k/hw.c
-@@ -499,11 +499,18 @@ static int ath9k_hw_init_macaddr(struct 
-               ahp->ah_macaddr[2 * i] = eeval >> 8;
-               ahp->ah_macaddr[2 * i + 1] = eeval & 0xff;
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include <linux/io.h>
++#include <linux/etherdevice.h>
+ #include <asm/unaligned.h>
+ 
+ #include "hw.h"
+@@ -441,8 +442,18 @@ 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(ahp->ah_macaddr)) {
+-      if (sum == 0 || sum == 0xffff * 3)
+-              return -EADDRNOTAVAIL;
++      if (!is_valid_ether_addr(common->macaddr)) {

 +              DECLARE_MAC_BUF(macbuf);
 +
 +              DECLARE_MAC_BUF(macbuf);
 +

-+              DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
++              ath_print(common, ATH_DBG_EEPROM,

 +                      "eeprom contains invalid mac address: %s\n",
 +                      "eeprom contains invalid mac address: %s\n",

-+                      print_mac(macbuf, ahp->ah_macaddr));
++                      print_mac(macbuf, common->macaddr));

 +
 +

-+              random_ether_addr(ahp->ah_macaddr);
-               DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
--                      "mac address read failed: %pM\n",
--                      ahp->ah_macaddr);
--              return -EADDRNOTAVAIL;
++              random_ether_addr(common->macaddr);
++              ath_print(common, ATH_DBG_EEPROM,

 +                      "random mac address will be used: %s\n",
 +                      "random mac address will be used: %s\n",

-+                      print_mac(macbuf, ahp->ah_macaddr));
-       }
++                      print_mac(macbuf, common->macaddr));
++      }

  
        return 0;
  
        return 0;

+ }