Changeset 31835


Ignore:
Timestamp:
2012-05-20T23:58:03+02:00 (4 years ago)
Author:
nbd
Message:

lantiq: allow platforms with rt2x00 to override the mac address without overriding eeprom, fixes bogus wlan mac address on arv4520

Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/files/include/linux/rt2x00_platform.h

    r30630 r31835  
    1515struct rt2x00_platform_data { 
    1616        char *eeprom_file_name; 
     17        const u8 *mac_address; 
    1718 
    1819        int disable_2ghz; 
  • trunk/target/linux/lantiq/files-3.3/arch/mips/lantiq/xway/dev-wifi-rt2x00.c

    r31735 r31835  
    2525 
    2626void __init 
    27 ltq_register_rt2x00(const char *firmware) 
     27ltq_register_rt2x00(const char *firmware, const u8 *mac) 
    2828{ 
    2929        rt2x00_pdata.eeprom_file_name = kstrdup(firmware, GFP_KERNEL); 
     30        rt2x00_pdata.mac_address = mac; 
    3031        ltqpci_plat_dev_init = rt2x00_pci_plat_dev_init; 
    3132} 
  • trunk/target/linux/lantiq/files-3.3/arch/mips/lantiq/xway/dev-wifi-rt2x00.h

    r31307 r31835  
    1010#define _DEV_WIFI_RT2X00_H__ 
    1111 
    12 extern void ltq_register_rt2x00(const char *firmware); 
     12extern void ltq_register_rt2x00(const char *firmware, const u8 *mac); 
    1313 
    1414#endif 
  • trunk/target/linux/lantiq/files-3.3/arch/mips/lantiq/xway/mach-arv.c

    r31735 r31835  
    598598        ltq_register_tapi(); 
    599599        arv_register_ethernet(ARV4520PW_MAC_ADDR); 
     600        ltq_register_rt2x00(NULL, (const u8 *) ltq_eth_data.mac.sa_data); 
    600601        xway_register_dwc(ARV4520PW_USB); 
    601602 
     
    687688        ltq_register_pci(&ltq_pci_data); 
    688689        ltq_eth_data.mii_mode = PHY_INTERFACE_MODE_MII; 
    689         ltq_register_rt2x00("RT2860.eeprom"); 
     690        ltq_register_rt2x00("RT2860.eeprom", NULL); 
    690691        ltq_register_tapi(); 
    691692        arv_register_ethernet(ARV7525P_MAC_ADDR); 
     
    774775        ltq_register_pci(&ltq_pci_data); 
    775776        xway_register_dwc(ARV752DPW22_USB); 
    776         ltq_register_rt2x00("RT2860.eeprom"); 
     777        ltq_register_rt2x00("RT2860.eeprom", NULL); 
    777778        arv_register_ethernet(ARV752DPW22_MAC_ADDR); 
    778779        gpio_request(ARV752DPW22_RELAY, "relay"); 
Note: See TracChangeset for help on using the changeset viewer.