Changeset 24104


Ignore:
Timestamp:
2010-11-22T20:59:13+01:00 (6 years ago)
Author:
nbd
Message:

iw: sync nl80211 header to fix the multicast rate setting

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/iw/patches/001-nl80211_sync.patch

    r23636 r24104  
    5656  * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver. 
    5757  *     We recommend using nested, driver-specific attributes within this. 
    58 @@ -787,6 +801,11 @@ enum nl80211_commands { 
     58@@ -787,6 +801,33 @@ enum nl80211_commands { 
    5959  *      This is used in association with @NL80211_ATTR_WIPHY_TX_POWER_SETTING 
    6060  *      for non-automatic settings. 
     
    6363+ *     means support for per-station GTKs. 
    6464+ * 
     65+ * @NL80211_ATTR_WIPHY_ANTENNA_TX: Bitmap of allowed antennas for transmitting. 
     66+ *     This can be used to mask out antennas which are not attached or should 
     67+ *     not be used for transmitting. If an antenna is not selected in this 
     68+ *     bitmap the hardware is not allowed to transmit on this antenna. 
     69+ * 
     70+ *     Each bit represents one antenna, starting with antenna 1 at the first 
     71+ *     bit. Depending on which antennas are selected in the bitmap, 802.11n 
     72+ *     drivers can derive which chainmasks to use (if all antennas belonging to 
     73+ *     a particular chain are disabled this chain should be disabled) and if 
     74+ *     a chain has diversity antennas wether diversity should be used or not. 
     75+ *     HT capabilities (STBC, TX Beamforming, Antenna selection) can be 
     76+ *     derived from the available chains after applying the antenna mask. 
     77+ *     Non-802.11n drivers can derive wether to use diversity or not. 
     78+ *     Drivers may reject configurations or RX/TX mask combinations they cannot 
     79+ *     support by returning -EINVAL. 
     80+ * 
     81+ * @NL80211_ATTR_WIPHY_ANTENNA_RX: Bitmap of allowed antennas for receiving. 
     82+ *     This can be used to mask out antennas which are not attached or should 
     83+ *     not be used for receiving. If an antenna is not selected in this bitmap 
     84+ *     the hardware should not be configured to receive on this antenna. 
     85+ *     For a more detailed descripton see @NL80211_ATTR_WIPHY_ANTENNA_TX. 
     86+ * 
    6587+ * @NL80211_ATTR_MCAST_RATE: Multicast tx rate (in 100 kbps) for IBSS 
    6688+ * 
     
    6890  * @__NL80211_ATTR_AFTER_LAST: internal use 
    6991  */ 
    70 @@ -951,6 +970,13 @@ enum nl80211_attrs { 
     92@@ -951,6 +992,16 @@ enum nl80211_attrs { 
    7193        NL80211_ATTR_RX_FRAME_TYPES, 
    7294        NL80211_ATTR_FRAME_TYPE, 
     
    7799+       NL80211_ATTR_SUPPORT_IBSS_RSN, 
    78100+ 
     101+       NL80211_ATTR_WIPHY_ANTENNA_TX, 
     102+       NL80211_ATTR_WIPHY_ANTENNA_RX, 
     103+ 
    79104+       NL80211_ATTR_MCAST_RATE, 
    80105+ 
     
    82107  
    83108        __NL80211_ATTR_AFTER_LAST, 
    84 @@ -1006,6 +1032,8 @@ enum nl80211_attrs { 
     109@@ -1006,6 +1057,8 @@ enum nl80211_attrs { 
    85110  * @NL80211_IFTYPE_WDS: wireless distribution interface 
    86111  * @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames 
     
    91116  * @NUM_NL80211_IFTYPES: number of defined interface types 
    92117  * 
    93 @@ -1022,6 +1050,8 @@ enum nl80211_iftype { 
     118@@ -1022,6 +1075,8 @@ enum nl80211_iftype { 
    94119        NL80211_IFTYPE_WDS, 
    95120        NL80211_IFTYPE_MONITOR, 
     
    100125        /* keep last */ 
    101126        NUM_NL80211_IFTYPES, 
    102 @@ -1111,6 +1141,8 @@ enum nl80211_rate_info { 
     127@@ -1111,6 +1166,8 @@ enum nl80211_rate_info { 
    103128  * @NL80211_STA_INFO_RX_PACKETS: total received packet (u32, from this station) 
    104129  * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (u32, to this 
     
    109134 enum nl80211_sta_info { 
    110135        __NL80211_STA_INFO_INVALID, 
    111 @@ -1124,6 +1156,8 @@ enum nl80211_sta_info { 
     136@@ -1124,6 +1181,8 @@ enum nl80211_sta_info { 
    112137        NL80211_STA_INFO_TX_BITRATE, 
    113138        NL80211_STA_INFO_RX_PACKETS, 
     
    118143        /* keep last */ 
    119144        __NL80211_STA_INFO_AFTER_LAST, 
    120 @@ -1382,6 +1416,17 @@ enum nl80211_reg_rule_flags { 
     145@@ -1277,7 +1336,11 @@ enum nl80211_bitrate_attr { 
     146  *     wireless core it thinks its knows the regulatory domain we should be in. 
     147  * @NL80211_REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an 
     148  *     802.11 country information element with regulatory information it 
     149- *     thinks we should consider. 
     150+ *     thinks we should consider. cfg80211 only processes the country 
     151+ *     code from the IE, and relies on the regulatory domain information 
     152+ *     structure pased by userspace (CRDA) from our wireless-regdb. 
     153+ *     If a channel is enabled but the country code indicates it should 
     154+ *     be disabled we disable the channel and re-enable it upon disassociation. 
     155  */ 
     156 enum nl80211_reg_initiator { 
     157        NL80211_REGDOM_SET_BY_CORE, 
     158@@ -1382,6 +1445,17 @@ enum nl80211_reg_rule_flags { 
    121159  * @__NL80211_SURVEY_INFO_INVALID: attribute number 0 is reserved 
    122160  * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel 
     
    136174  *     currently defined 
    137175  * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use 
    138 @@ -1390,6 +1435,12 @@ enum nl80211_survey_info { 
     176@@ -1390,6 +1464,12 @@ enum nl80211_survey_info { 
    139177        __NL80211_SURVEY_INFO_INVALID, 
    140178        NL80211_SURVEY_INFO_FREQUENCY, 
     
    149187        /* keep last */ 
    150188        __NL80211_SURVEY_INFO_AFTER_LAST, 
    151 @@ -1636,11 +1687,14 @@ enum nl80211_auth_type { 
     189@@ -1636,11 +1716,14 @@ enum nl80211_auth_type { 
    152190  * @NL80211_KEYTYPE_GROUP: Group (broadcast/multicast) key 
    153191  * @NL80211_KEYTYPE_PAIRWISE: Pairwise (unicast/individual) key 
     
    164202  
    165203 /** 
    166 @@ -1671,6 +1725,9 @@ enum nl80211_wpa_versions { 
     204@@ -1671,6 +1754,9 @@ enum nl80211_wpa_versions { 
    167205  *     CCMP keys, each six bytes in little endian 
    168206  * @NL80211_KEY_DEFAULT: flag indicating default key 
     
    174212  * @NL80211_KEY_MAX: highest key attribute 
    175213  */ 
    176 @@ -1682,6 +1739,7 @@ enum nl80211_key_attributes { 
     214@@ -1682,6 +1768,7 @@ enum nl80211_key_attributes { 
    177215        NL80211_KEY_SEQ, 
    178216        NL80211_KEY_DEFAULT, 
Note: See TracChangeset for help on using the changeset viewer.