From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 15 Jul 2010 07:37:00 +0000 (+0000)
Subject: madwifi: in-flash macs for mach-eap7660d
X-Git-Tag: v19.07.0-rc1~30066
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=84df6b372879382521317310eee0c28edef946a1;p=openwrt%2Fstaging%2Fhauke.git

madwifi: in-flash macs for mach-eap7660d

This patch makes madwifi respect (at least) the platform_data
supplied MAC address.

Signed-off-by: Daniel Golle <daniel.golle@gmail.com>

SVN-Revision: 22190
---

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 2fe2f9176e..f28254f661 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -12,7 +12,7 @@ PKG_NAME:=madwifi
 
 PKG_REV:=3314
 PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
diff --git a/package/madwifi/patches/470-mac_addresss_from_ath5k_platform_data.patch b/package/madwifi/patches/470-mac_addresss_from_ath5k_platform_data.patch
new file mode 100644
index 0000000000..c963403ebc
--- /dev/null
+++ b/package/madwifi/patches/470-mac_addresss_from_ath5k_platform_data.patch
@@ -0,0 +1,36 @@
+--- a/ath/if_ath.c	2010-07-13 22:58:23.000000000 +0200
++++ b/ath/if_ath.c	2010-07-13 23:03:20.000000000 +0200
+@@ -63,6 +63,8 @@
+ #include <linux/rtnetlink.h>
+ #include <linux/time.h>
+ #include <linux/pci.h>
++#include <linux/device.h>
++#include <linux/ath5k_platform.h>
+ #include <asm/uaccess.h>
+ 
+ #include "if_ethersubr.h"		/* for ETHER_IS_MULTICAST */
+@@ -587,6 +589,10 @@
+ 	unsigned int i;
+ 	int autocreatemode = -1;
+ 	u_int8_t csz;
++#ifdef ATH_PCI
++	struct ath5k_platform_data *pdata;
++	struct pci_dev *pdev;
++#endif
+ 
+ 	sc->devid = devid;
+ #ifdef AR_DEBUG
+@@ -648,6 +654,13 @@
+ 	}
+ 	sc->sc_ah = ah;
+ 
++#ifdef ATH_PCI
++	/* set MAC from ath_platform_data */
++	pdev = (struct pci_dev *)sc->sc_bdev;
++	pdata = pdev->dev.platform_data;
++	if (pdata && pdata->macaddr)
++		ath_hal_setmac(ah, pdata->macaddr);
++#endif
+ 	/* WAR for AR7100 PCI bug */
+ #ifdef CONFIG_ATHEROS_AR71XX
+ 	if ((ar_device(sc->devid) >= 5210) && (ar_device(sc->devid) < 5416)) {