Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

8 files changed, 119 insertions, 29 deletions

diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index 6083725dd22e..a7ae33d06f24 100644
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -283,6 +283,22 @@
 #define BCMA_CC_PPL_PCHI_OFF            5
 #define BCMA_CC_PPL_PCHI_MASK           0x0000003f
 
+/* BCM4331 ChipControl numbers. */
+#define BCMA_CHIPCTL_4331_BT_COEXIST            BIT(0)  /* 0 disable */
+#define BCMA_CHIPCTL_4331_SECI                  BIT(1)  /* 0 SECI is disabled (JATG functional) */
+#define BCMA_CHIPCTL_4331_EXT_LNA               BIT(2)  /* 0 disable */
+#define BCMA_CHIPCTL_4331_SPROM_GPIO13_15       BIT(3)  /* sprom/gpio13-15 mux */
+#define BCMA_CHIPCTL_4331_EXTPA_EN              BIT(4)  /* 0 ext pa disable, 1 ext pa enabled */
+#define BCMA_CHIPCTL_4331_GPIOCLK_ON_SPROMCS    BIT(5)  /* set drive out GPIO_CLK on sprom_cs pin */
+#define BCMA_CHIPCTL_4331_PCIE_MDIO_ON_SPROMCS  BIT(6)  /* use sprom_cs pin as PCIE mdio interface */
+#define BCMA_CHIPCTL_4331_EXTPA_ON_GPIO2_5      BIT(7)  /* aband extpa will be at gpio2/5 and sprom_dout */
+#define BCMA_CHIPCTL_4331_OVR_PIPEAUXCLKEN      BIT(8)  /* override core control on pipe_AuxClkEnable */
+#define BCMA_CHIPCTL_4331_OVR_PIPEAUXPWRDOWN    BIT(9)  /* override core control on pipe_AuxPowerDown */
+#define BCMA_CHIPCTL_4331_PCIE_AUXCLKEN         BIT(10) /* pcie_auxclkenable */
+#define BCMA_CHIPCTL_4331_PCIE_PIPE_PLLDOWN     BIT(11) /* pcie_pipe_pllpowerdown */
+#define BCMA_CHIPCTL_4331_BT_SHD0_ON_GPIO4      BIT(16) /* enable bt_shd0 at gpio4 */
+#define BCMA_CHIPCTL_4331_BT_SHD1_ON_GPIO5      BIT(17) /* enable bt_shd1 at gpio5 */
+
 /* Data for the PMU, if available.
  * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU)
  */
@@ -342,6 +358,8 @@ extern void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);
 extern void bcma_chipco_suspend(struct bcma_drv_cc *cc);
 extern void bcma_chipco_resume(struct bcma_drv_cc *cc);
 
+void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);
+
 extern void bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc,
                                           u32 ticks);
 
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 54c878960872..37f95f2e10f9 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -629,9 +629,14 @@ struct ieee80211_rann_ie {
         u8 rann_ttl;
         u8 rann_addr[6];
         u32 rann_seq;
+        u32 rann_interval;
         u32 rann_metric;
 } __attribute__ ((packed));
 
+enum ieee80211_rann_flags {
+        RANN_FLAG_IS_GATE = 1 << 0,
+};
+
 #define WLAN_SA_QUERY_TR_ID_LEN 2
 
 struct ieee80211_mgmt {
@@ -736,19 +741,10 @@ struct ieee80211_mgmt {
                                         __le16 params;
                                         __le16 reason_code;
                                 } __attribute__((packed)) delba;
-                                struct{
+                                struct {
                                         u8 action_code;
-                                        /* capab_info for open and confirm,
-                                         * reason for close
-                                         */
-                                        __le16 aux;
-                                        /* Followed in plink_confirm by status
-                                         * code, AID and supported rates,
-                                         * and directly by supported rates in
-                                         * plink_open and plink_close
-                                         */
                                         u8 variable[0];
-                                } __attribute__((packed)) plink_action;
+                                } __attribute__((packed)) self_prot;
                                 struct{
                                         u8 action_code;
                                         u8 variable[0];
@@ -816,9 +812,11 @@ struct ieee80211_bar {
 } __attribute__((packed));
 
 /* 802.11 BAR control masks */
-#define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL     0x0000
-#define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA  0x0004
-
+#define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL    0x0000
+#define IEEE80211_BAR_CTRL_MULTI_TID            0x0002
+#define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA 0x0004
+#define IEEE80211_BAR_CTRL_TID_INFO_MASK        0xf000
+#define IEEE80211_BAR_CTRL_TID_INFO_SHIFT       12
 
 #define IEEE80211_HT_MCS_MASK_LEN               10
 
@@ -1194,11 +1192,6 @@ enum ieee80211_eid {
         WLAN_EID_MESH_ID = 114,
         WLAN_EID_LINK_METRIC_REPORT = 115,
         WLAN_EID_CONGESTION_NOTIFICATION = 116,
-        /* Note that the Peer Link IE has been replaced with the similar
-         * Peer Management IE.  We will keep the former definition until mesh
-         * code is changed to comply with latest 802.11s drafts.
-         */
-        WLAN_EID_PEER_LINK = 55,  /* no longer in 802.11s drafts */
         WLAN_EID_PEER_MGMT = 117,
         WLAN_EID_CHAN_SWITCH_PARAM = 118,
         WLAN_EID_MESH_AWAKE_WINDOW = 119,
@@ -1281,9 +1274,6 @@ enum ieee80211_category {
         WLAN_CATEGORY_MULTIHOP_ACTION = 14,
         WLAN_CATEGORY_SELF_PROTECTED = 15,
         WLAN_CATEGORY_WMM = 17,
-        /* TODO: remove MESH_PATH_SEL after mesh is updated
-         * to current 802.11s draft  */
-        WLAN_CATEGORY_MESH_PATH_SEL = 32,
         WLAN_CATEGORY_VENDOR_SPECIFIC_PROTECTED = 126,
         WLAN_CATEGORY_VENDOR_SPECIFIC = 127,
 };
@@ -1309,6 +1299,31 @@ enum ieee80211_ht_actioncode {
         WLAN_HT_ACTION_ASEL_IDX_FEEDBACK = 7,
 };
 
+/* Self Protected Action codes */
+enum ieee80211_self_protected_actioncode {
+        WLAN_SP_RESERVED = 0,
+        WLAN_SP_MESH_PEERING_OPEN = 1,
+        WLAN_SP_MESH_PEERING_CONFIRM = 2,
+        WLAN_SP_MESH_PEERING_CLOSE = 3,
+        WLAN_SP_MGK_INFORM = 4,
+        WLAN_SP_MGK_ACK = 5,
+};
+
+/* Mesh action codes */
+enum ieee80211_mesh_actioncode {
+        WLAN_MESH_ACTION_LINK_METRIC_REPORT,
+        WLAN_MESH_ACTION_HWMP_PATH_SELECTION,
+        WLAN_MESH_ACTION_GATE_ANNOUNCEMENT,
+        WLAN_MESH_ACTION_CONGESTION_CONTROL_NOTIFICATION,
+        WLAN_MESH_ACTION_MCCA_SETUP_REQUEST,
+        WLAN_MESH_ACTION_MCCA_SETUP_REPLY,
+        WLAN_MESH_ACTION_MCCA_ADVERTISEMENT_REQUEST,
+        WLAN_MESH_ACTION_MCCA_ADVERTISEMENT,
+        WLAN_MESH_ACTION_MCCA_TEARDOWN,
+        WLAN_MESH_ACTION_TBTT_ADJUSTMENT_REQUEST,
+        WLAN_MESH_ACTION_TBTT_ADJUSTMENT_RESPONSE,
+};
+
 /* Security key length */
 enum ieee80211_key_len {
         WLAN_KEY_LEN_WEP40 = 5,
diff --git a/include/linux/nfc.h b/include/linux/nfc.h
index 330a4c5db588..c525e0b5876b 100644
--- a/include/linux/nfc.h
+++ b/include/linux/nfc.h
@@ -123,4 +123,6 @@ struct sockaddr_nfc {
 #define NFC_SOCKPROTO_RAW       0
 #define NFC_SOCKPROTO_MAX       1
 
+#define NFC_HEADER_SIZE 1
+
 #endif /*__LINUX_NFC_H */
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 89dec16b4697..0343504082a8 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -1042,6 +1042,9 @@ enum nl80211_commands {
  *      (Re)Association Response frames when the driver (or firmware) replies to
  *      (Re)Association Request frames.
  *
+ * @NL80211_ATTR_STA_WME: Nested attribute containing the wme configuration
+ *      of the station, see &enum nl80211_sta_wme_attr.
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -1252,6 +1255,8 @@ enum nl80211_attrs {
         NL80211_ATTR_IE_PROBE_RESP,
         NL80211_ATTR_IE_ASSOC_RESP,
 
+        NL80211_ATTR_STA_WME,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -1861,6 +1866,13 @@ enum nl80211_mntr_flags {
  * @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a
  * source mesh point for path selection elements.
  *
+ * @NL80211_MESHCONF_HWMP_RANN_INTERVAL:  The interval of time (in TUs) between
+ * root announcements are transmitted.
+ *
+ * @NL80211_MESHCONF_GATE_ANNOUNCEMENTS: Advertise that this mesh station has
+ * access to a broader network beyond the MBSS.  This is done via Root
+ * Announcement frames.
+ *
  * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
  *
  * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
@@ -1882,6 +1894,8 @@ enum nl80211_meshconf_params {
         NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
         NL80211_MESHCONF_HWMP_ROOTMODE,
         NL80211_MESHCONF_ELEMENT_TTL,
+        NL80211_MESHCONF_HWMP_RANN_INTERVAL,
+        NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
 
         /* keep last */
         __NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -2473,4 +2487,22 @@ enum nl80211_hidden_ssid {
         NL80211_HIDDEN_SSID_ZERO_CONTENTS
 };
 
+/**
+ * enum nl80211_sta_wme_attr - station WME attributes
+ * @__NL80211_STA_WME_INVALID: invalid number for nested attribute
+ * @NL80211_STA_WME_QUEUES: bitmap of uapsd queues.
+ * @NL80211_STA_WME_MAX_SP: max service period.
+ * @__NL80211_STA_WME_AFTER_LAST: internal
+ * @NL80211_STA_WME_MAX: highest station WME attribute
+ */
+enum nl80211_sta_wme_attr {
+        __NL80211_STA_WME_INVALID,
+        NL80211_STA_WME_UAPSD_QUEUES,
+        NL80211_STA_WME_MAX_SP,
+
+        /* keep last */
+        __NL80211_STA_WME_AFTER_LAST,
+        NL80211_STA_WME_MAX = __NL80211_STA_WME_AFTER_LAST - 1
+};
+
 #endif /* __LINUX_NL80211_H */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index d86a15d87e58..88112ca59c8e 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -452,6 +452,8 @@ struct station_parameters {
         u8 plink_action;
         u8 plink_state;
         struct ieee80211_ht_cap *ht_capa;
+        u8 uapsd_queues;
+        u8 max_sp;
 };
 
 /**
@@ -755,6 +757,12 @@ struct mesh_config {
         u16 dot11MeshHWMPpreqMinInterval;
         u16 dot11MeshHWMPnetDiameterTraversalTime;
         u8  dot11MeshHWMPRootMode;
+        u16 dot11MeshHWMPRannInterval;
+        /* This is missnamed in draft 12.0: dot11MeshGateAnnouncementProtocol
+         * set to true only means that the station will announce others it's a
+         * mesh gate, but not necessarily using the gate announcement protocol.
+         * Still keeping the same nomenclature to be in sync with the spec. */
+        bool  dot11MeshGateAnnouncementProtocol;
 };
 
 /**
@@ -2291,7 +2299,7 @@ struct ieee802_11_elems {
         struct ieee80211_ht_info *ht_info_elem;
         struct ieee80211_meshconf_ie *mesh_config;
         u8 *mesh_id;
-        u8 *peer_link;
+        u8 *peering;
         u8 *preq;
         u8 *prep;
         u8 *perr;
@@ -2318,7 +2326,7 @@ struct ieee802_11_elems {
         u8 wmm_info_len;
         u8 wmm_param_len;
         u8 mesh_id_len;
-        u8 peer_link_len;
+        u8 peering_len;
         u8 preq_len;
         u8 prep_len;
         u8 perr_len;
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 2f01d84ca52f..2e752df57510 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -954,6 +954,8 @@ struct ieee80211_sta {
         u16 aid;
         struct ieee80211_sta_ht_cap ht_cap;
         bool wme;
+        u8 uapsd_queues;
+        u8 max_sp;
 
         /* must be last */
         u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
diff --git a/include/net/nfc.h b/include/net/nfc.h
index cc0130312f70..87b51fe15b70 100644
--- a/include/net/nfc.h
+++ b/include/net/nfc.h
@@ -82,6 +82,9 @@ struct nfc_dev {
         struct nfc_genl_data genl_data;
         u32 supported_protocols;
 
+        int tx_headroom;
+        int tx_tailroom;
+
         struct nfc_ops *ops;
 };
 #define to_nfc_dev(_dev) container_of(_dev, struct nfc_dev, dev)
@@ -89,7 +92,9 @@ struct nfc_dev {
 extern struct class nfc_class;
 
 struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
-                                        u32 supported_protocols);
+                                        u32 supported_protocols,
+                                        int tx_headroom,
+                                        int tx_tailroom);
 
 /**
  * nfc_free_device - free nfc device
diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 356d6e3dc20a..eb7d3c2d4274 100644
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -3,11 +3,19 @@
 /*
  * regulatory support structures
  *
- * Copyright 2008-2009  Luis R. Rodriguez <lrodriguez@atheros.com>
+ * Copyright 2008-2009  Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */