1 files changed, 8 insertions, 6 deletions

diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index 09563c245473..f827caa73862 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -136,8 +136,8 @@ static struct sk_buff *taprio_dequeue(struct Qdisc *sch)
 {
         struct taprio_sched *q = qdisc_priv(sch);
         struct net_device *dev = qdisc_dev(sch);
+        struct sk_buff *skb = NULL;
         struct sched_entry *entry;
-        struct sk_buff *skb;
         u32 gate_mask;
         int i;
 
@@ -154,10 +154,9 @@ static struct sk_buff *taprio_dequeue(struct Qdisc *sch)
          * "AdminGateSates"
          */
         gate_mask = entry ? entry->gate_mask : TAPRIO_ALL_GATES_OPEN;
-        rcu_read_unlock();
 
         if (!gate_mask)
-                return NULL;
+                goto done;
 
         for (i = 0; i < dev->num_tx_queues; i++) {
                 struct Qdisc *child = q->qdiscs[i];
@@ -197,16 +196,19 @@ static struct sk_buff *taprio_dequeue(struct Qdisc *sch)
 
                 skb = child->ops->dequeue(child);
                 if (unlikely(!skb))
-                        return NULL;
+                        goto done;
 
                 qdisc_bstats_update(sch, skb);
                 qdisc_qstats_backlog_dec(sch, skb);
                 sch->q.qlen--;
 
-                return skb;
+                goto done;
         }
 
-        return NULL;
+done:
+        rcu_read_unlock();
+
+        return skb;
 }
 
 static enum hrtimer_restart advance_sched(struct hrtimer *timer)