Merge tag 'mac80211-next-for-davem-2017-10-11' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
Work continues in various areas:
 * port authorized event for 4-way-HS offload (Avi)
 * enable MFP optional for such devices (Emmanuel)
 * Kees's timer setup patch for mac80211 mesh
   (the part that isn't trivially scripted)
 * improve VLAN vs. TXQ handling (myself)
 * load regulatory database as firmware file (myself)
 * with various other small improvements and cleanups

I merged net-next once in the meantime to allow Kees's
timer setup patch to go in.
====================

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

6 files changed, 163 insertions, 47 deletions

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 55a604ad459f..ee6657a0ed69 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -2445,6 +2445,7 @@ enum ieee80211_sa_query_action {
 #define WLAN_OUI_TYPE_MICROSOFT_WPA     1
 #define WLAN_OUI_TYPE_MICROSOFT_WMM     2
 #define WLAN_OUI_TYPE_MICROSOFT_WPS     4
+#define WLAN_OUI_TYPE_MICROSOFT_TPC     8
 
 /*
  * WMM/802.11e Tspec Element
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index f12fa5245a45..8b8118a7fadb 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -4347,19 +4347,6 @@ static inline int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
 }
 
 /**
- * ieee80211_data_from_8023 - convert an 802.3 frame to 802.11
- * @skb: the 802.3 frame
- * @addr: the device MAC address
- * @iftype: the virtual interface type
- * @bssid: the network bssid (used only for iftype STATION and ADHOC)
- * @qos: build 802.11 QoS data frame
- * Return: 0 on success, or a negative error code.
- */
-int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr,
-                             enum nl80211_iftype iftype, const u8 *bssid,
-                             bool qos);
-
-/**
  * ieee80211_amsdu_to_8023s - decode an IEEE 802.11n A-MSDU frame
  *
  * Decode an IEEE 802.11 A-MSDU and convert it to a list of 802.3 frames.
@@ -5441,9 +5428,6 @@ cfg80211_connect_timeout(struct net_device *dev, const u8 *bssid,
  * @req_ie_len: association request IEs length
  * @resp_ie: association response IEs (may be %NULL)
  * @resp_ie_len: assoc response IEs length
- * @authorized: true if the 802.1X authentication was done by the driver or is
- *      not needed (e.g., when Fast Transition protocol was used), false
- *      otherwise. Ignored for networks that don't use 802.1X authentication.
  */
 struct cfg80211_roam_info {
         struct ieee80211_channel *channel;
@@ -5453,7 +5437,6 @@ struct cfg80211_roam_info {
         size_t req_ie_len;
         const u8 *resp_ie;
         size_t resp_ie_len;
-        bool authorized;
 };
 
 /**
@@ -5478,6 +5461,23 @@ void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
                      gfp_t gfp);
 
 /**
+ * cfg80211_port_authorized - notify cfg80211 of successful security association
+ *
+ * @dev: network device
+ * @bssid: the BSSID of the AP
+ * @gfp: allocation flags
+ *
+ * This function should be called by a driver that supports 4 way handshake
+ * offload after a security association was successfully established (i.e.,
+ * the 4 way handshake was completed successfully). The call to this function
+ * should be preceded with a call to cfg80211_connect_result(),
+ * cfg80211_connect_done(), cfg80211_connect_bss() or cfg80211_roamed() to
+ * indicate the 802.11 association.
+ */
+void cfg80211_port_authorized(struct net_device *dev, const u8 *bssid,
+                              gfp_t gfp);
+
+/**
  * cfg80211_disconnected - notify cfg80211 that connection was dropped
  *
  * @dev: network device
@@ -5934,7 +5934,8 @@ int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len,
  * @ies: the IE buffer
  * @ielen: the length of the IE buffer
  * @ids: an array with element IDs that are allowed before
- *      the split
+ *      the split. A WLAN_EID_EXTENSION value means that the next
+ *      EID in the list is a sub-element of the EXTENSION IE.
  * @n_ids: the size of the element ID array
  * @after_ric: array IE types that come after the RIC element
  * @n_after_ric: size of the @after_ric array
@@ -5965,7 +5966,8 @@ size_t ieee80211_ie_split_ric(const u8 *ies, size_t ielen,
  * @ies: the IE buffer
  * @ielen: the length of the IE buffer
  * @ids: an array with element IDs that are allowed before
- *      the split
+ *      the split. A WLAN_EID_EXTENSION value means that the next
+ *      EID in the list is a sub-element of the EXTENSION IE.
  * @n_ids: the size of the element ID array
  * @offset: offset where to start splitting in the buffer
  *
diff --git a/include/net/fq.h b/include/net/fq.h
index 6d8521a30c5c..ac944a686840 100644
--- a/include/net/fq.h
+++ b/include/net/fq.h
@@ -90,6 +90,13 @@ typedef void fq_skb_free_t(struct fq *,
                            struct fq_flow *,
                            struct sk_buff *);
 
+/* Return %true to filter (drop) the frame. */
+typedef bool fq_skb_filter_t(struct fq *,
+                             struct fq_tin *,
+                             struct fq_flow *,
+                             struct sk_buff *,
+                             void *);
+
 typedef struct fq_flow *fq_flow_get_default_t(struct fq *,
                                               struct fq_tin *,
                                               int idx,
diff --git a/include/net/fq_impl.h b/include/net/fq_impl.h
index 4e6131cd3f43..8b237e4afee6 100644
--- a/include/net/fq_impl.h
+++ b/include/net/fq_impl.h
@@ -12,24 +12,22 @@
 
 /* functions that are embedded into includer */
 
-static struct sk_buff *fq_flow_dequeue(struct fq *fq,
-                                       struct fq_flow *flow)
+static void fq_adjust_removal(struct fq *fq,
+                              struct fq_flow *flow,
+                              struct sk_buff *skb)
 {
         struct fq_tin *tin = flow->tin;
-        struct fq_flow *i;
-        struct sk_buff *skb;
-
-        lockdep_assert_held(&fq->lock);
-
-        skb = __skb_dequeue(&flow->queue);
-        if (!skb)
-                return NULL;
 
         tin->backlog_bytes -= skb->len;
         tin->backlog_packets--;
         flow->backlog -= skb->len;
         fq->backlog--;
         fq->memory_usage -= skb->truesize;
+}
+
+static void fq_rejigger_backlog(struct fq *fq, struct fq_flow *flow)
+{
+        struct fq_flow *i;
 
         if (flow->backlog == 0) {
                 list_del_init(&flow->backlogchain);
@@ -43,6 +41,21 @@ static struct sk_buff *fq_flow_dequeue(struct fq *fq,
                 list_move_tail(&flow->backlogchain,
                                &i->backlogchain);
         }
+}
+
+static struct sk_buff *fq_flow_dequeue(struct fq *fq,
+                                       struct fq_flow *flow)
+{
+        struct sk_buff *skb;
+
+        lockdep_assert_held(&fq->lock);
+
+        skb = __skb_dequeue(&flow->queue);
+        if (!skb)
+                return NULL;
+
+        fq_adjust_removal(fq, flow, skb);
+        fq_rejigger_backlog(fq, flow);
 
         return skb;
 }
@@ -188,6 +201,45 @@ static void fq_tin_enqueue(struct fq *fq,
         }
 }
 
+static void fq_flow_filter(struct fq *fq,
+                           struct fq_flow *flow,
+                           fq_skb_filter_t filter_func,
+                           void *filter_data,
+                           fq_skb_free_t free_func)
+{
+        struct fq_tin *tin = flow->tin;
+        struct sk_buff *skb, *tmp;
+
+        lockdep_assert_held(&fq->lock);
+
+        skb_queue_walk_safe(&flow->queue, skb, tmp) {
+                if (!filter_func(fq, tin, flow, skb, filter_data))
+                        continue;
+
+                __skb_unlink(skb, &flow->queue);
+                fq_adjust_removal(fq, flow, skb);
+                free_func(fq, tin, flow, skb);
+        }
+
+        fq_rejigger_backlog(fq, flow);
+}
+
+static void fq_tin_filter(struct fq *fq,
+                          struct fq_tin *tin,
+                          fq_skb_filter_t filter_func,
+                          void *filter_data,
+                          fq_skb_free_t free_func)
+{
+        struct fq_flow *flow;
+
+        lockdep_assert_held(&fq->lock);
+
+        list_for_each_entry(flow, &tin->new_flows, flowchain)
+                fq_flow_filter(fq, flow, filter_func, filter_data, free_func);
+        list_for_each_entry(flow, &tin->old_flows, flowchain)
+                fq_flow_filter(fq, flow, filter_func, filter_data, free_func);
+}
+
 static void fq_flow_reset(struct fq *fq,
                           struct fq_flow *flow,
                           fq_skb_free_t free_func)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 885690fa39c8..cc9073e45be9 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -5441,8 +5441,14 @@ void ieee80211_mark_rx_ba_filtered_frames(struct ieee80211_sta *pubsta, u8 tid,
  */
 void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn);
 
+/**
+ * ieee80211_manage_rx_ba_offl - helper to queue an RX BA work
+ * @vif: &struct ieee80211_vif pointer from the add_interface callback
+ * @addr: station mac address
+ * @tid: the rx tid
+ */
 void ieee80211_manage_rx_ba_offl(struct ieee80211_vif *vif, const u8 *addr,
-                                 unsigned int bit);
+                                 unsigned int tid);
 
 /**
  * ieee80211_start_rx_ba_session_offl - start a Rx BA session
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 51626b4175c0..f882fe1f9709 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -569,13 +569,14 @@
  *      authentication/association or not receiving a response from the AP.
  *      Non-zero %NL80211_ATTR_STATUS_CODE value is indicated in that case as
  *      well to remain backwards compatible.
- * @NL80211_CMD_ROAM: notifcation indicating the card/driver roamed by itself.
- *      When the driver roamed in a network that requires 802.1X authentication,
- *      %NL80211_ATTR_PORT_AUTHORIZED should be set if the 802.1X authentication
- *      was done by the driver or if roaming was done using Fast Transition
- *      protocol (in which case 802.1X authentication is not needed). If
- *      %NL80211_ATTR_PORT_AUTHORIZED is not set, user space is responsible for
- *      the 802.1X authentication.
+ *      When establishing a security association, drivers that support 4 way
+ *      handshake offload should send %NL80211_CMD_PORT_AUTHORIZED event when
+ *      the 4 way handshake is completed successfully.
+ * @NL80211_CMD_ROAM: Notification indicating the card/driver roamed by itself.
+ *      When a security association was established with the new AP (e.g. if
+ *      the FT protocol was used for roaming or the driver completed the 4 way
+ *      handshake), this event should be followed by an
+ *      %NL80211_CMD_PORT_AUTHORIZED event.
  * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify
  *      userspace that a connection was dropped by the AP or due to other
  *      reasons, for this the %NL80211_ATTR_DISCONNECTED_BY_AP and
@@ -982,6 +983,14 @@
  * @NL80211_CMD_DEL_PMK: For offloaded 4-Way handshake, delete the previously
  *      configured PMK for the authenticator address identified by
  *      &NL80211_ATTR_MAC.
+ * @NL80211_CMD_PORT_AUTHORIZED: An event that indicates that the 4 way
+ *      handshake was completed successfully by the driver. The BSSID is
+ *      specified with &NL80211_ATTR_MAC. Drivers that support 4 way handshake
+ *      offload should send this event after indicating 802.11 association with
+ *      &NL80211_CMD_CONNECT or &NL80211_CMD_ROAM. If the 4 way handshake failed
+ *      &NL80211_CMD_DISCONNECT should be indicated instead.
+ *
+ * @NL80211_CMD_RELOAD_REGDB: Request that the regdb firmware file is reloaded.
  *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
@@ -1185,6 +1194,10 @@ enum nl80211_commands {
         NL80211_CMD_SET_PMK,
         NL80211_CMD_DEL_PMK,
 
+        NL80211_CMD_PORT_AUTHORIZED,
+
+        NL80211_CMD_RELOAD_REGDB,
+
         /* add new commands above here */
 
         /* used to define NL80211_CMD_MAX below */
@@ -1407,8 +1420,12 @@ enum nl80211_commands {
  *
  * @NL80211_ATTR_USE_MFP: Whether management frame protection (IEEE 802.11w) is
  *      used for the association (&enum nl80211_mfp, represented as a u32);
- *      this attribute can be used
- *      with %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests
+ *      this attribute can be used with %NL80211_CMD_ASSOCIATE and
+ *      %NL80211_CMD_CONNECT requests. %NL80211_MFP_OPTIONAL is not allowed for
+ *      %NL80211_CMD_ASSOCIATE since user space SME is expected and hence, it
+ *      must have decided whether to use management frame protection or not.
+ *      Setting %NL80211_MFP_OPTIONAL with a %NL80211_CMD_CONNECT request will
+ *      let the driver (or the firmware) decide whether to use MFP or not.
  *
  * @NL80211_ATTR_STA_FLAGS2: Attribute containing a
  *      &struct nl80211_sta_flag_update.
@@ -2134,10 +2151,7 @@ enum nl80211_commands {
  *      in %NL80211_CMD_CONNECT to indicate that for 802.1X authentication it
  *      wants to use the supported offload of the 4-way handshake.
  * @NL80211_ATTR_PMKR0_NAME: PMK-R0 Name for offloaded FT.
- * @NL80211_ATTR_PORT_AUTHORIZED: flag attribute used in %NL80211_CMD_ROAMED
- *      notification indicating that that 802.1X authentication was done by
- *      the driver or is not needed (because roaming used the Fast Transition
- *      protocol).
+ * @NL80211_ATTR_PORT_AUTHORIZED: (reserved)
  *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
@@ -3947,10 +3961,12 @@ enum nl80211_key_type {
  * enum nl80211_mfp - Management frame protection state
  * @NL80211_MFP_NO: Management frame protection not used
  * @NL80211_MFP_REQUIRED: Management frame protection required
+ * @NL80211_MFP_OPTIONAL: Management frame protection is optional
  */
 enum nl80211_mfp {
         NL80211_MFP_NO,
         NL80211_MFP_REQUIRED,
+        NL80211_MFP_OPTIONAL,
 };
 
 enum nl80211_wpa_versions {
@@ -4914,6 +4930,17 @@ enum nl80211_feature_flags {
  *      handshake with 802.1X in station mode (will pass EAP frames to the host
  *      and accept the set_pmk/del_pmk commands), doing it in the host might not
  *      be supported.
+ * @NL80211_EXT_FEATURE_FILS_MAX_CHANNEL_TIME: Driver is capable of overriding
+ *      the max channel attribute in the FILS request params IE with the
+ *      actual dwell time.
+ * @NL80211_EXT_FEATURE_ACCEPT_BCAST_PROBE_RESP: Driver accepts broadcast probe
+ *      response
+ * @NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE: Driver supports sending
+ *      the first probe request in each channel at rate of at least 5.5Mbps.
+ * @NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION: Driver supports
+ *      probe request tx deferral and suppression
+ * @NL80211_EXT_FEATURE_MFP_OPTIONAL: Driver supports the %NL80211_MFP_OPTIONAL
+ *      value in %NL80211_ATTR_USE_MFP.
  *
  * @NUM_NL80211_EXT_FEATURES: number of extended features.
  * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -4936,6 +4963,11 @@ enum nl80211_ext_feature_index {
         NL80211_EXT_FEATURE_FILS_SK_OFFLOAD,
         NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK,
         NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X,
+        NL80211_EXT_FEATURE_FILS_MAX_CHANNEL_TIME,
+        NL80211_EXT_FEATURE_ACCEPT_BCAST_PROBE_RESP,
+        NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE,
+        NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION,
+        NL80211_EXT_FEATURE_MFP_OPTIONAL,
 
         /* add new features before the definition below */
         NUM_NL80211_EXT_FEATURES,
@@ -5012,12 +5044,28 @@ enum nl80211_timeout_reason {
  *      locally administered 1, multicast 0) is assumed.
  *      This flag must not be requested when the feature isn't supported, check
  *      the nl80211 feature flags for the device.
+ * @NL80211_SCAN_FLAG_FILS_MAX_CHANNEL_TIME: fill the dwell time in the FILS
+ *      request parameters IE in the probe request
+ * @NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP: accept broadcast probe responses
+ * @NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE: send probe request frames at
+ *      rate of at least 5.5M. In case non OCE AP is dicovered in the channel,
+ *      only the first probe req in the channel will be sent in high rate.
+ * @NL80211_SCAN_FLAG_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION: allow probe request
+ *      tx deferral (dot11FILSProbeDelay shall be set to 15ms)
+ *      and suppression (if it has received a broadcast Probe Response frame,
+ *      Beacon frame or FILS Discovery frame from an AP that the STA considers
+ *      a suitable candidate for (re-)association - suitable in terms of
+ *      SSID and/or RSSI
  */
 enum nl80211_scan_flags {
-        NL80211_SCAN_FLAG_LOW_PRIORITY                  = 1<<0,
-        NL80211_SCAN_FLAG_FLUSH                         = 1<<1,
-        NL80211_SCAN_FLAG_AP                            = 1<<2,
-        NL80211_SCAN_FLAG_RANDOM_ADDR                   = 1<<3,
+        NL80211_SCAN_FLAG_LOW_PRIORITY                          = 1<<0,
+        NL80211_SCAN_FLAG_FLUSH                                 = 1<<1,
+        NL80211_SCAN_FLAG_AP                                    = 1<<2,
+        NL80211_SCAN_FLAG_RANDOM_ADDR                           = 1<<3,
+        NL80211_SCAN_FLAG_FILS_MAX_CHANNEL_TIME                 = 1<<4,
+        NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP               = 1<<5,
+        NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE            = 1<<6,
+        NL80211_SCAN_FLAG_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION    = 1<<7,
 };
 
 /**