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

The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 179f1c8c0d8b..956ead2cab9a 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -560,8 +560,8 @@ static struct sk_buff *netem_dequeue(struct Qdisc *sch)
 tfifo_dequeue:
         skb = __skb_dequeue(&sch->q);
         if (skb) {
-deliver:
                 qdisc_qstats_backlog_dec(sch, skb);
+deliver:
                 qdisc_unthrottled(sch);
                 qdisc_bstats_update(sch, skb);
                 return skb;
@@ -578,6 +578,7 @@ deliver:
                         rb_erase(p, &q->t_root);
 
                         sch->q.qlen--;
+                        qdisc_qstats_backlog_dec(sch, skb);
                         skb->next = NULL;
                         skb->prev = NULL;
                         skb->tstamp = netem_skb_cb(skb)->tstamp_save;