001-nl80211_h_sync.patch 3.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798
  1. --- a/nl80211.h
  2. +++ b/nl80211.h
  3. @@ -2061,6 +2061,10 @@ enum nl80211_commands {
  4. * @NL80211_ATTR_INTERFACE_COMBINATIONS: Nested attribute listing the supported
  5. * interface combinations. In each nested item, it contains attributes
  6. * defined in &enum nl80211_if_combination_attrs.
  7. + * If the wiphy uses multiple radios (@NL80211_ATTR_WIPHY_RADIOS is set),
  8. + * this attribute contains the interface combinations of the first radio.
  9. + * See @NL80211_ATTR_WIPHY_INTERFACE_COMBINATIONS for the global wiphy
  10. + * combinations for the sum of all radios.
  11. * @NL80211_ATTR_SOFTWARE_IFTYPES: Nested attribute (just like
  12. * %NL80211_ATTR_SUPPORTED_IFTYPES) containing the interface types that
  13. * are managed in software: interfaces of these types aren't subject to
  14. @@ -2856,6 +2860,17 @@ enum nl80211_commands {
  15. * %NL80211_CMD_ASSOCIATE indicating the SPP A-MSDUs
  16. * are used on this connection
  17. *
  18. + * @NL80211_ATTR_WIPHY_RADIOS: Nested attribute describing physical radios
  19. + * belonging to this wiphy. See &enum nl80211_wiphy_radio_attrs.
  20. + *
  21. + * @NL80211_ATTR_WIPHY_INTERFACE_COMBINATIONS: Nested attribute listing the
  22. + * supported interface combinations for all radios combined. In each
  23. + * nested item, it contains attributes defined in
  24. + * &enum nl80211_if_combination_attrs.
  25. + *
  26. + * @NL80211_ATTR_VIF_RADIO_MASK: Bitmask of allowed radios (u32).
  27. + * A value of 0 means all radios.
  28. + *
  29. * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  30. * @NL80211_ATTR_MAX: highest attribute number currently defined
  31. * @__NL80211_ATTR_AFTER_LAST: internal use
  32. @@ -3401,6 +3416,11 @@ enum nl80211_attrs {
  33. NL80211_ATTR_ASSOC_SPP_AMSDU,
  34. + NL80211_ATTR_WIPHY_RADIOS,
  35. + NL80211_ATTR_WIPHY_INTERFACE_COMBINATIONS,
  36. +
  37. + NL80211_ATTR_VIF_RADIO_MASK,
  38. +
  39. /* add attributes here, update the policy in nl80211.c */
  40. __NL80211_ATTR_AFTER_LAST,
  41. @@ -7987,4 +8007,54 @@ enum nl80211_ap_settings_flags {
  42. NL80211_AP_SETTINGS_SA_QUERY_OFFLOAD_SUPPORT = 1 << 1,
  43. };
  44. +/**
  45. + * enum nl80211_wiphy_radio_attrs - wiphy radio attributes
  46. + *
  47. + * @__NL80211_WIPHY_RADIO_ATTR_INVALID: Invalid
  48. + *
  49. + * @NL80211_WIPHY_RADIO_ATTR_INDEX: Index of this radio (u32)
  50. + * @NL80211_WIPHY_RADIO_ATTR_FREQ_RANGE: Frequency range supported by this
  51. + * radio. Attribute may be present multiple times.
  52. + * @NL80211_WIPHY_RADIO_ATTR_INTERFACE_COMBINATION: Supported interface
  53. + * combination for this radio. Attribute may be present multiple times
  54. + * and contains attributes defined in &enum nl80211_if_combination_attrs.
  55. + *
  56. + * @__NL80211_WIPHY_RADIO_ATTR_LAST: Internal
  57. + * @NL80211_WIPHY_RADIO_ATTR_MAX: Highest attribute
  58. + */
  59. +enum nl80211_wiphy_radio_attrs {
  60. + __NL80211_WIPHY_RADIO_ATTR_INVALID,
  61. +
  62. + NL80211_WIPHY_RADIO_ATTR_INDEX,
  63. + NL80211_WIPHY_RADIO_ATTR_FREQ_RANGE,
  64. + NL80211_WIPHY_RADIO_ATTR_INTERFACE_COMBINATION,
  65. +
  66. + /* keep last */
  67. + __NL80211_WIPHY_RADIO_ATTR_LAST,
  68. + NL80211_WIPHY_RADIO_ATTR_MAX = __NL80211_WIPHY_RADIO_ATTR_LAST - 1,
  69. +};
  70. +
  71. +/**
  72. + * enum nl80211_wiphy_radio_freq_range - wiphy radio frequency range
  73. + *
  74. + * @__NL80211_WIPHY_RADIO_FREQ_ATTR_INVALID: Invalid
  75. + *
  76. + * @NL80211_WIPHY_RADIO_FREQ_ATTR_START: Frequency range start (u32).
  77. + * The unit is kHz.
  78. + * @NL80211_WIPHY_RADIO_FREQ_ATTR_END: Frequency range end (u32).
  79. + * The unit is kHz.
  80. + *
  81. + * @__NL80211_WIPHY_RADIO_FREQ_ATTR_LAST: Internal
  82. + * @NL80211_WIPHY_RADIO_FREQ_ATTR_MAX: Highest attribute
  83. + */
  84. +enum nl80211_wiphy_radio_freq_range {
  85. + __NL80211_WIPHY_RADIO_FREQ_ATTR_INVALID,
  86. +
  87. + NL80211_WIPHY_RADIO_FREQ_ATTR_START,
  88. + NL80211_WIPHY_RADIO_FREQ_ATTR_END,
  89. +
  90. + __NL80211_WIPHY_RADIO_FREQ_ATTR_LAST,
  91. + NL80211_WIPHY_RADIO_FREQ_ATTR_MAX = __NL80211_WIPHY_RADIO_FREQ_ATTR_LAST - 1,
  92. +};
  93. +
  94. #endif /* __LINUX_NL80211_H */