2009-11-28 18:01:03 +00:00
|
|
|
--- a/include/linux/ath9k_platform.h
|
|
|
|
|
+++ b/include/linux/ath9k_platform.h
|
|
|
|
|
@@ -23,6 +23,7 @@
|
|
|
|
|
|
|
|
|
|
struct ath9k_platform_data {
|
|
|
|
|
u16 eeprom_data[ATH9K_PLAT_EEP_MAX_WORDS];
|
|
|
|
|
+ u8 *macaddr;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#endif /* _LINUX_ATH9K_PLATFORM_H */
|
2010-11-19 00:57:35 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/init.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
|
|
|
|
@@ -16,6 +16,7 @@
|
|
|
|
|
|
|
|
|
|
#include <linux/slab.h>
|
|
|
|
|
#include <linux/pm_qos_params.h>
|
|
|
|
|
+#include <linux/ath9k_platform.h>
|
|
|
|
|
|
|
|
|
|
#include "ath9k.h"
|
|
|
|
|
|
|
|
|
|
@@ -520,6 +521,7 @@ static void ath9k_init_misc(struct ath_s
|
|
|
|
|
static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid,
|
|
|
|
|
const struct ath_bus_ops *bus_ops)
|
|
|
|
|
{
|
|
|
|
|
+ struct ath9k_platform_data *pdata = sc->dev->platform_data;
|
|
|
|
|
struct ath_hw *ah = NULL;
|
|
|
|
|
struct ath_common *common;
|
|
|
|
|
int ret = 0, i;
|
|
|
|
|
@@ -565,6 +567,9 @@ static int ath9k_init_softc(u16 devid, s
|
|
|
|
|
if (ret)
|
|
|
|
|
goto err_hw;
|
|
|
|
|
|
|
|
|
|
+ if (pdata && pdata->macaddr)
|
|
|
|
|
+ memcpy(common->macaddr, pdata->macaddr, ETH_ALEN);
|
|
|
|
|
+
|
|
|
|
|
ret = ath9k_init_debug(ah);
|
|
|
|
|
if (ret) {
|
|
|
|
|
ath_print(common, ATH_DBG_FATAL,
|
