History

Merge tag 'master-2014-12-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

John W. Linville says: ==================== pull request: wireless-next 2014-12-08 Please pull this last batch of pending wireless updates for the 3.19 tree... For the wireless bits, Johannes says: "This time I have Felix's no-status rate control work, which will allow drivers to work better with rate control even if they don't have perfect status reporting. In addition to this, a small hwsim fix from Patrik, one of the regulatory patches from Arik, and a number of cleanups and fixes I did myself. Of note is a patch where I disable CFG80211_WEXT so that compatibility is no longer selectable - this is intended as a wake-up call for anyone who's still using it, and is still easily worked around (it's a one-line patch) before we fully remove the code as well in the future." For the Bluetooth bits, Johan says: "Here's one more bluetooth-next pull request for 3.19: - Minor cleanups for ieee802154 & mac802154 - Fix for the kernel warning with !TASK_RUNNING reported by Kirill A. Shutemov - Support for another ath3k device - Fix for tracking link key based security level - Device tree bindings for btmrvl + a state update fix - Fix for wrong ACL flags on LE links" And... "In addition to the previous one this contains two more cleanups to mac802154 as well as support for some new HCI features from the Bluetooth 4.2 specification. From the original request: 'Here's what should be the last bluetooth-next pull request for 3.19. It's rather large but the majority of it is the Low Energy Secure Connections feature that's part of the Bluetooth 4.2 specification. The specification went public only this week so we couldn't publish the corresponding code before that. The code itself can nevertheless be considered fairly mature as it's been in development for over 6 months and gone through several interoperability test events. Besides LE SC the pull request contains an important fix for command complete events for mgmt sockets which also fixes some leaks of hci_conn objects when powering off or unplugging Bluetooth adapters. A smaller feature that's part of the pull request is service discovery support. This is like normal device discovery except that devices not matching specific UUIDs or strong enough RSSI are filtered out. Other changes that the pull request contains are firmware dump support to the btmrvl driver, firmware download support for Broadcom BCM20702A0 variants, as well as some coding style cleanups in 6lowpan & ieee802154/mac802154 code.'" For the NFC bits, Samuel says: "With this one we get: - NFC digital improvements for DEP support: Chaining, NACK and ATN support added. - NCI improvements: Support for p2p target, SE IO operand addition, SE operands extensions to support proprietary implementations, and a few fixes. - NFC HCI improvements: OPEN_PIPE and NOTIFY_ALL_CLEARED support, and SE IO operand addition. - A bunch of minor improvements and fixes for STMicro st21nfcb and st21nfca" For the iwlwifi bits, Emmanuel says: "Major works are CSA and TDLS. On top of that I have a new firmware API for scan and a few rate control improvements. Johannes find a few tricks to improve our CPU utilization and adds support for a new spin of 7265 called 7265D. Along with this a few random things that don't stand out." And... "I deprecate here -8.ucode since -9 has been published long ago. Along with that I have a new activity, we have now better a infrastructure for firmware debugging. This will allow to have configurable probes insides the firmware. Luca continues his work on NetDetect, this feature is now complete. All the rest is minor fixes here and there." For the Atheros bits, Kalle says: "Only ath10k changes this time and no major changes. Most visible are: o new debugfs interface for runtime firmware debugging (Yanbo) o fix shared WEP (Sujith) o don't rebuild whenever kernel version changes (Johannes) o lots of refactoring to make it easier to add new hw support (Michal) There's also smaller fixes and improvements with no point of listing here." In addition, there are a few last minute updates to ath5k, ath9k, brcmfmac, brcmsmac, mwifiex, rt2x00, rtlwifi, and wil6210. Also included is a pull of the wireless tree to pick-up the fixes originally included in "pull request: wireless 2014-12-03"... Please let me know if there are problems! ====================

David S. Miller committed 11 years ago

Commit b5f185f2 parents 450fa21 81c4126228 files · +12428 −3574Browse files

Showing the changes to include/uapi/linux (2 of 228 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/nfc.h +14 −9
  2. include/uapi/linux/nl80211.h +4 −3
include/uapi/linux/nfc.h+14−9
@@ -116,6 +116,7 @@ enum nfc_commands { · 115 unmodified lines
116 NFC_EVENT_SE_TRANSACTION,116 NFC_EVENT_SE_TRANSACTION,
117 NFC_CMD_GET_SE,117 NFC_CMD_GET_SE,
118 NFC_CMD_SE_IO,118 NFC_CMD_SE_IO,
119 NFC_CMD_ACTIVATE_TARGET,
119/* private: internal use only */120/* private: internal use only */
120 __NFC_CMD_AFTER_LAST121 __NFC_CMD_AFTER_LAST
121};122};
@@ -196,15 +197,19 @@ enum nfc_sdp_attr { · 74 unmodified lines
196};197};
197#define NFC_SDP_ATTR_MAX (__NFC_SDP_ATTR_AFTER_LAST - 1)198#define NFC_SDP_ATTR_MAX (__NFC_SDP_ATTR_AFTER_LAST - 1)
198 199
199#define NFC_DEVICE_NAME_MAXSIZE 8200#define NFC_DEVICE_NAME_MAXSIZE 8
200#define NFC_NFCID1_MAXSIZE 10201#define NFC_NFCID1_MAXSIZE 10
201#define NFC_NFCID2_MAXSIZE 8202#define NFC_NFCID2_MAXSIZE 8
202#define NFC_NFCID3_MAXSIZE 10203#define NFC_NFCID3_MAXSIZE 10
203#define NFC_SENSB_RES_MAXSIZE 12204#define NFC_SENSB_RES_MAXSIZE 12
204#define NFC_SENSF_RES_MAXSIZE 18205#define NFC_SENSF_RES_MAXSIZE 18
205#define NFC_GB_MAXSIZE 48206#define NFC_ATR_REQ_MAXSIZE 64
206#define NFC_FIRMWARE_NAME_MAXSIZE 32207#define NFC_ATR_RES_MAXSIZE 64
207#define NFC_ISO15693_UID_MAXSIZE 8208#define NFC_ATR_REQ_GB_MAXSIZE 48
209#define NFC_ATR_RES_GB_MAXSIZE 47
210#define NFC_GB_MAXSIZE 48
211#define NFC_FIRMWARE_NAME_MAXSIZE 32
212#define NFC_ISO15693_UID_MAXSIZE 8
208 213
209/* NFC protocols */214/* NFC protocols */
210#define NFC_PROTO_JEWEL 1215#define NFC_PROTO_JEWEL 1
include/uapi/linux/nl80211.h+4−3
@@ -3451,6 +3451,8 @@ enum nl80211_ps_state { · 3450 unmodified lines
3451 * interval in which %NL80211_ATTR_CQM_TXE_PKTS and3451 * interval in which %NL80211_ATTR_CQM_TXE_PKTS and
3452 * %NL80211_ATTR_CQM_TXE_RATE must be satisfied before generating an3452 * %NL80211_ATTR_CQM_TXE_RATE must be satisfied before generating an
3453 * %NL80211_CMD_NOTIFY_CQM. Set to 0 to turn off TX error reporting.3453 * %NL80211_CMD_NOTIFY_CQM. Set to 0 to turn off TX error reporting.
3454 * @NL80211_ATTR_CQM_BEACON_LOSS_EVENT: flag attribute that's set in a beacon
3455 * loss event
3454 * @__NL80211_ATTR_CQM_AFTER_LAST: internal3456 * @__NL80211_ATTR_CQM_AFTER_LAST: internal
3455 * @NL80211_ATTR_CQM_MAX: highest key attribute3457 * @NL80211_ATTR_CQM_MAX: highest key attribute
3456 */3458 */
@@ -3463,6 +3465,7 @@ enum nl80211_attr_cqm { · 6 unmodified lines
3463 NL80211_ATTR_CQM_TXE_RATE,3465 NL80211_ATTR_CQM_TXE_RATE,
3464 NL80211_ATTR_CQM_TXE_PKTS,3466 NL80211_ATTR_CQM_TXE_PKTS,
3465 NL80211_ATTR_CQM_TXE_INTVL,3467 NL80211_ATTR_CQM_TXE_INTVL,
3468 NL80211_ATTR_CQM_BEACON_LOSS_EVENT,
3466 3469
3467 /* keep last */3470 /* keep last */
3468 __NL80211_ATTR_CQM_AFTER_LAST,3471 __NL80211_ATTR_CQM_AFTER_LAST,
@@ -3475,9 +3478,7 @@ enum nl80211_attr_cqm { · 6 unmodified lines
3475 * configured threshold3478 * configured threshold
3476 * @NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH: The RSSI is higher than the3479 * @NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH: The RSSI is higher than the
3477 * configured threshold3480 * configured threshold
3478 * @NL80211_CQM_RSSI_BEACON_LOSS_EVENT: The device experienced beacon loss.3481 * @NL80211_CQM_RSSI_BEACON_LOSS_EVENT: (reserved, never sent)
3479 * (Note that deauth/disassoc will still follow if the AP is not
3480 * available. This event might get used as roaming event, etc.)
3481 */3482 */
3482enum nl80211_cqm_rssi_threshold_event {3483enum nl80211_cqm_rssi_threshold_event {
3483 NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,3484 NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,