Merge tag '5.14-rc1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-microblaze.git] / net / sched / cls_api.c

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 340d5af..d73b5c5 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -1531,7 +1531,7 @@ static inline int __tcf_classify(struct sk_buff *skb,
                                 u32 *last_executed_chain)
 {
 #ifdef CONFIG_NET_CLS_ACT
-       const int max_reclassify_loop = 4;
+       const int max_reclassify_loop = 16;
        const struct tcf_proto *first_tp;
        int limit = 0;
 
@@ -1624,7 +1624,7 @@ int tcf_classify_ingress(struct sk_buff *skb,
 
        /* If we missed on some chain */
        if (ret == TC_ACT_UNSPEC && last_executed_chain) {
-               ext = skb_ext_add(skb, TC_SKB_EXT);
+               ext = tc_skb_ext_alloc(skb);
                if (WARN_ON_ONCE(!ext))
                        return TC_ACT_SHOT;
                ext->chain = last_executed_chain;
@@ -3662,6 +3662,9 @@ int tc_setup_flow_action(struct flow_action *flow_action,
                        entry->police.burst = tcf_police_burst(act);
                        entry->police.rate_bytes_ps =
                                tcf_police_rate_bytes_ps(act);
+                       entry->police.burst_pkt = tcf_police_burst_pkt(act);
+                       entry->police.rate_pkt_ps =
+                               tcf_police_rate_pkt_ps(act);
                        entry->police.mtu = tcf_police_tcfp_mtu(act);
                        entry->police.index = act->tcfa_index;
                } else if (is_tcf_ct(act)) {