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

John W. Linville says:

====================
pull request: wireless-next 2014-09-08

Please pull this batch of updates intended for the 3.18 stream...

For the mac80211 bits, Johannes says:

"Not that much content this time. Some RCU cleanups, crypto
performance improvements, and various patches all over,
rather than listing them one might as well look into the
git log instead."

For the Bluetooth bits, Gustavo says:

"The changes consists of:

        - Coding style fixes to HCI drivers
        - Corrupted ack value fix for the H5 HCI driver
        - A couple of Enhanced L2CAP fixes
        - Conversion of SMP code to use common L2CAP channel API
        - Page scan optimizations when using the kernel-side whitelist
        - Various mac802154 and and ieee802154 6lowpan cleanups
        - One new Atheros USB ID"

For the iwlwifi bits, Emmanuel says:

"We have a new big thing coming up which is called Dynamic Queue
Allocation (or DQA).  This is a completely new way to work with the
Tx queues and it requires major refactoring.  This is being done by
Johannes and Avri.  Besides this, Johannes disables U-APSD by default
because of APs that would disable A-MPDU if the association supports
U-ASPD.  Luca contributed to the power area which he was cleaning
up on the way while working on CSA.  A few more random things here
and there."

For the Atheros bits, Kalle says:

"For ath6kl we had two small fixes and a new SDIO device id.

For ath10k the bigger changes are:

 * support for new firmware version 10.2 (Michal)

 * spectral scan support (Simon, Sven & Mathias)

 * export a firmware crash dump file (Ben & me)

 * cleaning up of pci.c (Michal)

 * print pci id in all messages, which causes most of the churn (Michal)"

Beyond that, we have the usual collection of various updates to ath9k,
b43, mwifiex, and wil6210, as well as a few other bits here and there.

Please let me know if there are problems!
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 70 insertions, 0 deletions

diff --git a/include/linux/bcma/bcma_regs.h b/include/linux/bcma/bcma_regs.h
index 917dcd7965e7..e64ae7bf80a1 100644
--- a/include/linux/bcma/bcma_regs.h
+++ b/include/linux/bcma/bcma_regs.h
@@ -39,6 +39,11 @@
 #define  BCMA_RESET_CTL_RESET           0x0001
 #define BCMA_RESET_ST                   0x0804
 
+#define BCMA_NS_ROM_IOST_BOOT_DEV_MASK  0x0003
+#define BCMA_NS_ROM_IOST_BOOT_DEV_NOR   0x0000
+#define BCMA_NS_ROM_IOST_BOOT_DEV_NAND  0x0001
+#define BCMA_NS_ROM_IOST_BOOT_DEV_ROM   0x0002
+
 /* BCMA PCI config space registers. */
 #define BCMA_PCI_PMCSR                  0x44
 #define  BCMA_PCI_PE                    0x100
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 63ab3873c5ed..8018c915ee63 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -838,6 +838,16 @@ enum ieee80211_vht_opmode_bits {
 
 #define WLAN_SA_QUERY_TR_ID_LEN 2
 
+/**
+ * struct ieee80211_tpc_report_ie
+ *
+ * This structure refers to "TPC Report element"
+ */
+struct ieee80211_tpc_report_ie {
+        u8 tx_power;
+        u8 link_margin;
+} __packed;
+
 struct ieee80211_mgmt {
         __le16 frame_control;
         __le16 duration;
@@ -973,6 +983,13 @@ struct ieee80211_mgmt {
                                         u8 action_code;
                                         u8 operating_mode;
                                 } __packed vht_opmode_notif;
+                                struct {
+                                        u8 action_code;
+                                        u8 dialog_token;
+                                        u8 tpc_elem_id;
+                                        u8 tpc_elem_length;
+                                        struct ieee80211_tpc_report_ie tpc;
+                                } __packed tpc_report;
                         } u;
                 } __packed action;
         } u;
@@ -1865,6 +1882,7 @@ enum ieee80211_category {
         WLAN_CATEGORY_DLS = 2,
         WLAN_CATEGORY_BACK = 3,
         WLAN_CATEGORY_PUBLIC = 4,
+        WLAN_CATEGORY_RADIO_MEASUREMENT = 5,
         WLAN_CATEGORY_HT = 7,
         WLAN_CATEGORY_SA_QUERY = 8,
         WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION = 9,
@@ -2378,4 +2396,51 @@ static inline bool ieee80211_check_tim(const struct ieee80211_tim_ie *tim,
 #define TU_TO_JIFFIES(x)        (usecs_to_jiffies((x) * 1024))
 #define TU_TO_EXP_TIME(x)       (jiffies + TU_TO_JIFFIES(x))
 
+/**
+ * ieee80211_action_contains_tpc - checks if the frame contains TPC element
+ * @skb: the skb containing the frame, length will be checked
+ *
+ * This function checks if it's either TPC report action frame or Link
+ * Measurement report action frame as defined in IEEE Std. 802.11-2012 8.5.2.5
+ * and 8.5.7.5 accordingly.
+ */
+static inline bool ieee80211_action_contains_tpc(struct sk_buff *skb)
+{
+        struct ieee80211_mgmt *mgmt = (void *)skb->data;
+
+        if (!ieee80211_is_action(mgmt->frame_control))
+                return false;
+
+        if (skb->len < IEEE80211_MIN_ACTION_SIZE +
+                       sizeof(mgmt->u.action.u.tpc_report))
+                return false;
+
+        /*
+         * TPC report - check that:
+         * category = 0 (Spectrum Management) or 5 (Radio Measurement)
+         * spectrum management action = 3 (TPC/Link Measurement report)
+         * TPC report EID = 35
+         * TPC report element length = 2
+         *
+         * The spectrum management's tpc_report struct is used here both for
+         * parsing tpc_report and radio measurement's link measurement report
+         * frame, since the relevant part is identical in both frames.
+         */
+        if (mgmt->u.action.category != WLAN_CATEGORY_SPECTRUM_MGMT &&
+            mgmt->u.action.category != WLAN_CATEGORY_RADIO_MEASUREMENT)
+                return false;
+
+        /* both spectrum mgmt and link measurement have same action code */
+        if (mgmt->u.action.u.tpc_report.action_code !=
+            WLAN_ACTION_SPCT_TPC_RPRT)
+                return false;
+
+        if (mgmt->u.action.u.tpc_report.tpc_elem_id != WLAN_EID_TPC_REPORT ||
+            mgmt->u.action.u.tpc_report.tpc_elem_length !=
+            sizeof(struct ieee80211_tpc_report_ie))
+                return false;
+
+        return true;
+}
+
 #endif /* LINUX_IEEE80211_H */