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>

4 files changed, 97 insertions, 30 deletions

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);