[...]

 			/* ctrl still refers to the first buffer descriptor

@@ -1396,20 +1397,22 @@ static bool ptp_one_step_sync(struct sk_buff 

*skb)
 static int macb_tx_complete(struct macb_queue *queue, int budget)
 {
 	struct macb *bp = queue->bp;
-	u16 queue_index = queue - bp->queues;
 	unsigned long flags;
 	unsigned int tail;
 	unsigned int head;
+	u16 queue_index;
 	int packets = 0;
 	u32 bytes = 0;

+	queue_index  = queue - bp->queues;