2 files changed, 6 insertions, 2 deletions

diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index f8f047b61245..723964c3ee4f 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -294,6 +294,8 @@ static int tcf_act_police(struct sk_buff *skb, struct tc_action *a,
         if (police->tcfp_ewma_rate &&
             police->tcf_rate_est.bps >= police->tcfp_ewma_rate) {
                 police->tcf_qstats.overlimits++;
+                if (police->tcf_action == TC_ACT_SHOT)
+                        police->tcf_qstats.drops++;
                 spin_unlock(&police->tcf_lock);
                 return police->tcf_action;
         }
@@ -327,6 +329,8 @@ static int tcf_act_police(struct sk_buff *skb, struct tc_action *a,
         }
 
         police->tcf_qstats.overlimits++;
+        if (police->tcf_action == TC_ACT_SHOT)
+                police->tcf_qstats.drops++;
         spin_unlock(&police->tcf_lock);
         return police->tcf_action;
 }
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 266151ae85a3..18d85d259104 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -349,13 +349,13 @@ META_COLLECTOR(int_sk_type)
 META_COLLECTOR(int_sk_rmem_alloc)
 {
         SKIP_NONLOCAL(skb);
-        dst->value = atomic_read(&skb->sk->sk_rmem_alloc);
+        dst->value = sk_rmem_alloc_get(skb->sk);
 }
 
 META_COLLECTOR(int_sk_wmem_alloc)
 {
         SKIP_NONLOCAL(skb);
-        dst->value = atomic_read(&skb->sk->sk_wmem_alloc);
+        dst->value = sk_wmem_alloc_get(skb->sk);
 }
 
 META_COLLECTOR(int_sk_omem_alloc)