diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-07-15 07:37:00 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-07-15 07:37:00 +0000 |
| commit | 6d1ca0acf0d412e1fcafd0a6a3f8dddcd99e37f4 (patch) | |
| tree | cc275e596c7be4559f177bb53eaa146162ee12c0 /package/madwifi | |
| parent | e0afcb82f940ec27ca7edb12e8d1f8bdd518b2b3 (diff) | |
| download | upstream-6d1ca0acf0d412e1fcafd0a6a3f8dddcd99e37f4.tar.gz upstream-6d1ca0acf0d412e1fcafd0a6a3f8dddcd99e37f4.tar.bz2 upstream-6d1ca0acf0d412e1fcafd0a6a3f8dddcd99e37f4.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22190 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi')
| -rw-r--r-- | package/madwifi/Makefile | 2 | ||||
| -rw-r--r-- | package/madwifi/patches/470-mac_addresss_from_ath5k_platform_data.patch | 36 |
2 files changed, 37 insertions, 1 deletions
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)) { |