Merge remote-tracking branch 'personal/v1.4.1' into v1.4.1
[librecmc/librecmc.git] / package / kernel / mac80211 / patches / 607-rt2x00-add_platform_data_mac_addr.patch
1 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
2 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
3 @@ -1001,8 +1001,13 @@ static void rt2x00lib_rate(struct ieee80
4  
5  void rt2x00lib_set_mac_address(struct rt2x00_dev *rt2x00dev, u8 *eeprom_mac_addr)
6  {
7 +       struct rt2x00_platform_data *pdata;
8         const char *mac_addr;
9  
10 +       pdata = rt2x00dev->dev->platform_data;
11 +       if (pdata && pdata->mac_address)
12 +               ether_addr_copy(eeprom_mac_addr, pdata->mac_address);
13 +
14         mac_addr = of_get_mac_address(rt2x00dev->dev->of_node);
15         if (mac_addr)
16                 ether_addr_copy(eeprom_mac_addr, mac_addr);
17 --- a/include/linux/rt2x00_platform.h
18 +++ b/include/linux/rt2x00_platform.h
19 @@ -14,6 +14,7 @@
20  
21  struct rt2x00_platform_data {
22         char *eeprom_file_name;
23 +       const u8 *mac_address;
24  
25         int disable_2ghz;
26         int disable_5ghz;