Home Explore Help
Register Sign In
wareck
/
openwrt-archive
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 2f76d8f3a7
Branches Tags
openwrt-archive
/
package
/
kernel
/
mac80211
/
patches
/
608-add_platform_data_mac_addr.patch

608-add_platform_data_mac_addr.patch 1.8 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263 
  1. --- a/include/linux/rt2x00_platform.h
    2. 

  2. +++ b/include/linux/rt2x00_platform.h
    3. 

  3. @@ -14,6 +14,7 @@
    4. 

  4.  
    5. 

  5.  struct rt2x00_platform_data {
    6. 

  6.  	char *eeprom_file_name;
    7. 

  7. +	const u8 *mac_address;
    8. 

  8.  
    9. 

  9.  	int disable_2ghz;
    10. 

  10.  	int disable_5ghz;
    11. 

  11. --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
    12. 

  12. +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
    13. 

  13. @@ -931,6 +931,18 @@ static void rt2x00lib_rate(struct ieee80
    14. 

  14.  		entry->flags |= IEEE80211_RATE_SHORT_PREAMBLE;
    15. 

  15.  }
    16. 

  16.  
    17. 

  17. +const u8 *rt2x00lib_get_mac_address(struct rt2x00_dev *rt2x00dev)
    18. 

  18. +{
    19. 

  19. +	struct rt2x00_platform_data *pdata;
    20. 

  20. +
    21. 

  21. +	pdata = rt2x00dev->dev->platform_data;
    22. 

  22. +	if (!pdata)
    23. 

  23. +		return NULL;
    24. 

  24. +
    25. 

  25. +	return pdata->mac_address;
    26. 

  26. +}
    27. 

  27. +EXPORT_SYMBOL_GPL(rt2x00lib_get_mac_address);
    28. 

  28. +
    29. 

  29.  static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
    30. 

  30.  				    struct hw_mode_spec *spec)
    31. 

  31.  {
    32. 

  32. --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
    33. 

  33. +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
    34. 

  34. @@ -1416,6 +1416,7 @@ static inline void rt2x00debug_dump_fram
    35. 

  35.   */
    36. 

  36.  u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev,
    37. 

  37.  			 struct ieee80211_vif *vif);
    38. 

  38. +const u8 *rt2x00lib_get_mac_address(struct rt2x00_dev *rt2x00dev);
    39. 

  39.  
    40. 

  40.  /*
    41. 

  41.   * Interrupt context handlers.
    42. 

  42. --- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
    43. 

  43. +++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
    44. 

  44. @@ -2392,6 +2392,7 @@ static int rt61pci_validate_eeprom(struc
    45. 

  45.  	u32 reg;
    46. 

  46.  	u16 word;
    47. 

  47.  	u8 *mac;
    48. 

  48. +	const u8 *pdata_mac;
    49. 

  49.  	s8 value;
    50. 

  50.  
    51. 

  51.  	rt2x00mmio_register_read(rt2x00dev, E2PROM_CSR, &reg);
    52. 

  52. @@ -2412,7 +2413,11 @@ static int rt61pci_validate_eeprom(struc
    53. 

  53.  	/*
    54. 

  54.  	 * Start validation of the data that has been read.
    55. 

  55.  	 */
    56. 

  56. +	pdata_mac = rt2x00lib_get_mac_address(rt2x00dev);
    57. 

  57.  	mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
    58. 

  58. +	if (pdata_mac)
    59. 

  59. +		memcpy(mac, pdata_mac, 6);
    60. 

  60. +
    61. 

  61.  	if (!is_valid_ether_addr(mac)) {
    62. 

  62.  		eth_random_addr(mac);
    63. 

  63.  		rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);
    64.