Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 4 deletions

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 0c311be92827..961386e2f2c0 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -41,13 +41,13 @@ static struct tcf_hashinfo mirred_hash_info = {
         .lock   =       &mirred_lock,
 };
 
-static inline int tcf_mirred_release(struct tcf_mirred *m, int bind)
+static int tcf_mirred_release(struct tcf_mirred *m, int bind)
 {
         if (m) {
                 if (bind)
                         m->tcf_bindcnt--;
                 m->tcf_refcnt--;
-                if(!m->tcf_bindcnt && m->tcf_refcnt <= 0) {
+                if (!m->tcf_bindcnt && m->tcf_refcnt <= 0) {
                         list_del(&m->tcfm_list);
                         if (m->tcfm_dev)
                                 dev_put(m->tcfm_dev);
@@ -165,8 +165,7 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
 
         spin_lock(&m->tcf_lock);
         m->tcf_tm.lastuse = jiffies;
-        m->tcf_bstats.bytes += qdisc_pkt_len(skb);
-        m->tcf_bstats.packets++;
+        bstats_update(&m->tcf_bstats, skb);
 
         dev = m->tcfm_dev;
         if (!dev) {