Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[pandora-kernel.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index a8e4dd4..69445a3 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3645,7 +3645,7 @@ static inline struct sk_buff *handle_ing(struct sk_buff *skb,
 
        qdisc_skb_cb(skb)->pkt_len = skb->len;
        skb->tc_verd = SET_TC_AT(skb->tc_verd, AT_INGRESS);
-       qdisc_bstats_update_cpu(cl->q, skb);
+       qdisc_bstats_cpu_update(cl->q, skb);
 
        switch (tc_classify(skb, cl, &cl_res)) {
        case TC_ACT_OK:
@@ -3653,7 +3653,7 @@ static inline struct sk_buff *handle_ing(struct sk_buff *skb,
                skb->tc_index = TC_H_MIN(cl_res.classid);
                break;
        case TC_ACT_SHOT:
-               qdisc_qstats_drop_cpu(cl->q);
+               qdisc_qstats_cpu_drop(cl->q);
        case TC_ACT_STOLEN:
        case TC_ACT_QUEUED:
                kfree_skb(skb);