Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fb1b1e1 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: add support for overriding the MAC address through platform data 



On some devices the correct MAC address is not in the EEPROM data, but
stored somewhere else.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 691680b8

drivers/net/wireless/ath/ath9k/init.c

+6 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <linux/slab.h>

#include <linux/ath9k_platform.h>



#include "ath9k.h"
@@ -537,6 +538,7 @@ static void ath9k_init_misc(struct ath_softc *sc) 
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;
@@ -551,7 +553,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
	ah->hw_version.subsysid = subsysid;

	sc->sc_ah = ah;



	if (!sc->dev->platform_data)

	if (!pdata)

		ah->ah_flags |= AH_USE_EEPROM;



	common = ath9k_hw_common(ah);
@@ -587,6 +589,9 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
	if (ret)

		goto err_hw;



	if (pdata && pdata->macaddr)

		memcpy(common->macaddr, pdata->macaddr, ETH_ALEN);



	ret = ath9k_init_queues(sc);

	if (ret)

		goto err_queues;

include/linux/ath9k_platform.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


struct ath9k_platform_data {

	u16 eeprom_data[ATH9K_PLAT_EEP_MAX_WORDS];

	u8 *macaddr;

};



#endif /* _LINUX_ATH9K_PLATFORM_H */