Changeset 35731


Ignore:
Timestamp:
2013-02-21T19:02:50+01:00 (5 years ago)
Author:
juhosg
Message:

AA: ar71xx: fix MAC address assignment on the DIR-825-Bx boards

Backport of r35730.

Use the same MAC addresses as the original firmware.

Based on a patch from #10421.

Signed-off-by: Gabor Juhos <juhosg@…>
Tested-by: Gabor Varga <vargagab@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/attitude_adjustment/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-b1.c

    r33538 r35731  
    139139{ 
    140140        u8 *caldata; 
    141         u8 mac1[ETH_ALEN], mac2[ETH_ALEN]; 
     141        u8 mac0[ETH_ALEN], mac1[ETH_ALEN]; 
     142        u8 wmac0[ETH_ALEN], wmac1[ETH_ALEN]; 
    142143 
    143144        caldata = (u8 *) KSEG1ADDR(DIR825B1_CAL_LOCATION_0); 
     
    150151        } 
    151152 
    152         dir825b1_read_ascii_mac(mac1, caldata + DIR825B1_MAC0_OFFSET); 
    153         dir825b1_read_ascii_mac(mac2, caldata + DIR825B1_MAC1_OFFSET); 
    154  
    155         ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 2); 
    156         ath79_init_mac(ath79_eth1_data.mac_addr, mac1, 3); 
     153        dir825b1_read_ascii_mac(mac0, caldata + DIR825B1_MAC0_OFFSET); 
     154        dir825b1_read_ascii_mac(mac1, caldata + DIR825B1_MAC1_OFFSET); 
     155 
     156        ath79_init_mac(ath79_eth0_data.mac_addr, mac0, 0); 
     157        ath79_init_mac(ath79_eth1_data.mac_addr, mac1, 0); 
     158        ath79_init_mac(wmac0, mac0, 0); 
     159        ath79_init_mac(wmac1, mac1, 1); 
    157160 
    158161        ap9x_pci_setup_wmac_led_pin(0, 5); 
    159162        ap9x_pci_setup_wmac_led_pin(1, 5); 
    160163 
    161         ap94_pci_init(caldata + DIR825B1_CAL0_OFFSET, mac1, 
    162                       caldata + DIR825B1_CAL1_OFFSET, mac2); 
     164        ap94_pci_init(caldata + DIR825B1_CAL0_OFFSET, wmac0, 
     165                      caldata + DIR825B1_CAL1_OFFSET, wmac1); 
    163166} 
    164167 
Note: See TracChangeset for help on using the changeset viewer.