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

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 6 deletions

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 6eac3d880048..aaaf02175338 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -621,17 +621,17 @@ deliver:
 #endif
 
                         if (q->qdisc) {
+                                unsigned int pkt_len = qdisc_pkt_len(skb);
                                 struct sk_buff *to_free = NULL;
                                 int err;
 
                                 err = qdisc_enqueue(skb, q->qdisc, &to_free);
                                 kfree_skb_list(to_free);
-                                if (unlikely(err != NET_XMIT_SUCCESS)) {
-                                        if (net_xmit_drop_count(err)) {
-                                                qdisc_qstats_drop(sch);
-                                                qdisc_tree_reduce_backlog(sch, 1,
-                                                                          qdisc_pkt_len(skb));
-                                        }
+                                if (err != NET_XMIT_SUCCESS &&
+                                    net_xmit_drop_count(err)) {
+                                        qdisc_qstats_drop(sch);
+                                        qdisc_tree_reduce_backlog(sch, 1,
+                                                                  pkt_len);
                                 }
                                 goto tfifo_dequeue;
                         }