History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

John W. Linville says: ==================== pull request: wireless-next 2014-07-03 Please pull this first batch of wireless updates intended for the 3.17 stream... For the mac80211 bits, Johannes says: "The biggest thing here is probably Arik's TDLS rework, beyond that we have smaller improvements and features like David's scanning IE thing, Luca's queue work, some CSA work, etc. Also your PID rate control removal, of course." For the iwlwifi bits, Emmanuel says: "I have here a whole bunch of various things. Andy contributes better debug prints for dvm specific flows and a module parameter to completely disable power save for dvm. Andrei is sharing the premises of his work on CSA - more to come. Eran and Liad keep on working on the new devices. I have the regular amount of BT Coex stuff and I continue to work on the firmware error report system adding more debug capabilities. More to come on that subject too." On top of that, there are some cleanups to the new rsi driver, some continuing improvements to the rtl818x drivers, and the usual bundles of updates to ath9k, b43, mwifiex, wil6210, and a few other bits here and there. ====================

David S. Miller committed 12 years ago

Commit 72948cd2 parents 9f12fbe f473832256 files · +11859 −4509Browse files

Showing the changes to include/uapi/linux (1 of 256 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+5−0
@@ -1591,6 +1591,9 @@ enum nl80211_commands { · 1590 unmodified lines
1591 * creation then the new interface will be owned by the netlink socket1591 * creation then the new interface will be owned by the netlink socket
1592 * that created it and will be destroyed when the socket is closed1592 * that created it and will be destroyed when the socket is closed
1593 *1593 *
1594 * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
1595 * the TDLS link initiator.
1596 *
1594 * @NL80211_ATTR_MAX: highest attribute number currently defined1597 * @NL80211_ATTR_MAX: highest attribute number currently defined
1595 * @__NL80211_ATTR_AFTER_LAST: internal use1598 * @__NL80211_ATTR_AFTER_LAST: internal use
1596 */1599 */
@@ -1931,6 +1934,8 @@ enum nl80211_attrs { · 334 unmodified lines
1931 NL80211_ATTR_CSA_C_OFFSETS_TX,1934 NL80211_ATTR_CSA_C_OFFSETS_TX,
1932 NL80211_ATTR_MAX_CSA_COUNTERS,1935 NL80211_ATTR_MAX_CSA_COUNTERS,
1933 1936
1937 NL80211_ATTR_TDLS_INITIATOR,
1938
1934 /* add attributes here, update the policy in nl80211.c */1939 /* add attributes here, update the policy in nl80211.c */
1935 1940
1936 __NL80211_ATTR_AFTER_LAST,1941 __NL80211_ATTR_AFTER_LAST,