These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / sched / sch_sfb.c

diff --git a/kernel/net/sched/sch_sfb.c b/kernel/net/sched/sch_sfb.c
index 5819dd8..5bbb633 100644 (file)
--- a/kernel/net/sched/sch_sfb.c
+++ b/kernel/net/sched/sch_sfb.c
@@ -26,7 +26,6 @@
 #include <net/ip.h>
 #include <net/pkt_sched.h>
 #include <net/inet_ecn.h>
-#include <net/flow_keys.h>
 
 /*
  * SFB uses two B[l][n] : L x N arrays of bins (L levels, N bins per level)
@@ -259,7 +258,7 @@ static bool sfb_classify(struct sk_buff *skb, struct tcf_proto *fl,
        struct tcf_result res;
        int result;
 
-       result = tc_classify(skb, fl, &res);
+       result = tc_classify(skb, fl, &res, false);
        if (result >= 0) {
 #ifdef CONFIG_NET_CLS_ACT
                switch (result) {
@@ -285,9 +284,9 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
        int i;
        u32 p_min = ~0;
        u32 minqlen = ~0;
-       u32 r, slot, salt, sfbhash;
+       u32 r, sfbhash;
+       u32 slot = q->slot;
        int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
-       struct flow_keys keys;
 
        if (unlikely(sch->q.qlen >= q->limit)) {
                qdisc_qstats_overlimit(sch);
@@ -309,22 +308,17 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 
        fl = rcu_dereference_bh(q->filter_list);
        if (fl) {
+               u32 salt;
+
                /* If using external classifiers, get result and record it. */
                if (!sfb_classify(skb, fl, &ret, &salt))
                        goto other_drop;
-               keys.src = salt;
-               keys.dst = 0;
-               keys.ports = 0;
+               sfbhash = jhash_1word(salt, q->bins[slot].perturbation);
        } else {
-               skb_flow_dissect(skb, &keys);
+               sfbhash = skb_get_hash_perturb(skb, q->bins[slot].perturbation);
        }
 
-       slot = q->slot;
 
-       sfbhash = jhash_3words((__force u32)keys.dst,
-                              (__force u32)keys.src,
-                              (__force u32)keys.ports,
-                              q->bins[slot].perturbation);
        if (!sfbhash)
                sfbhash = 1;
        sfb_skb_cb(skb)->hashes[slot] = sfbhash;
@@ -356,10 +350,8 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
        if (unlikely(p_min >= SFB_MAX_PROB)) {
                /* Inelastic flow */
                if (q->double_buffering) {
-                       sfbhash = jhash_3words((__force u32)keys.dst,
-                                              (__force u32)keys.src,
-                                              (__force u32)keys.ports,
-                                              q->bins[slot].perturbation);
+                       sfbhash = skb_get_hash_perturb(skb,
+                           q->bins[slot].perturbation);
                        if (!sfbhash)
                                sfbhash = 1;
                        sfb_skb_cb(skb)->hashes[slot] = sfbhash;
@@ -510,7 +502,7 @@ static int sfb_change(struct Qdisc *sch, struct nlattr *opt)
 
        limit = ctl->limit;
        if (limit == 0)
-               limit = max_t(u32, qdisc_dev(sch)->tx_queue_len, 1);
+               limit = qdisc_dev(sch)->tx_queue_len;
 
        child = fifo_create_dflt(sch, &pfifo_qdisc_ops, limit);
        if (IS_ERR(child))