History

Merge tag 'wireless-drivers-next-for-davem-2017-07-03' of https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says: ==================== wireless-drivers-next patches for 4.13 Last minute changes to get new hardware and firmware support for iwlwifi and few other changes I was able to squeeze in. Also two patches for ieee80211.h and nl80211 as Johannes is away. Major changes: iwlwifi * some important fixes for 9000 HW * support for version 30 of the FW API for 8000 and 9000 series * a few new PCI IDs for 9000 series * reorganization of common files brcmfmac * support 4-way handshake offloading for WPA/WPA2-PSK and 802.1X ====================

David S. Miller committed 9 years ago

Commit bcdb9e82 parents 3a3f7d1 17d9aa677 files · +1538 −628Browse files

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

Unified · Split

include/uapi/linux/nl80211.h+4−5
@@ -1909,11 +1909,10 @@ enum nl80211_commands { · 1908 unmodified lines
19091909 * that configured the indoor setting, and the indoor operation would be
19101910 * cleared when the socket is closed.
19111911 * If set during NAN interface creation, the interface will be destroyed
1912− * if the socket is closed just like any other interface. Moreover, only
1913− * the netlink socket that created the interface will be allowed to add
1914− * and remove functions. NAN notifications will be sent in unicast to that
1915− * socket. Without this attribute, any socket can add functions and the
1916− * notifications will be sent to the %NL80211_MCGRP_NAN multicast group.
1912+ * if the socket is closed just like any other interface. Moreover, NAN
1913+ * notifications will be sent in unicast to that socket. Without this
1914+ * attribute, the notifications will be sent to the %NL80211_MCGRP_NAN
1915+ * multicast group.
19171916 * If set during %NL80211_CMD_ASSOCIATE or %NL80211_CMD_CONNECT the
19181917 * station will deauthenticate when the socket is closed.
19191918 *