[PATCH net-next 10/40] net: fec: pass rxq to fec_enet_rx_queue instead of queue_id

[Troy Kisky]

The queue_id is the qid member of struct bufdesc_prop.

Signed-off-by: Troy Kisky <troy.ki...@boundarydevices.com>
---
 drivers/net/ethernet/freescale/fec_main.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c 
b/drivers/net/ethernet/freescale/fec_main.c
index 3ed79fd..01b9740 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1320,11 +1320,9 @@ static bool fec_enet_copybreak(struct net_device *ndev, 
struct sk_buff **skb,
  * not been given to the system, we just set the empty indicator,
  * effectively tossing the packet.
  */
-static int
-fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id)
+static int fec_rxq(struct net_device *ndev, struct fec_enet_private *fep,
+                  struct fec_enet_priv_rx_q *rxq, int budget)
 {
-       struct fec_enet_private *fep = netdev_priv(ndev);
-       struct fec_enet_priv_rx_q *rxq;
        struct bufdesc *bdp;
        unsigned short status;
        struct  sk_buff *skb_new = NULL;
@@ -1342,8 +1340,6 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, 
u16 queue_id)
 #ifdef CONFIG_M532x
        flush_cache_all();
 #endif
-       queue_id = FEC_ENET_GET_QUQUE(queue_id);
-       rxq = fep->rx_queue[queue_id];
 
        /* First, grab all of the stats for the incoming packet.
         * These get messed up if we get called due to a busy condition.
@@ -1508,11 +1504,12 @@ fec_enet_rx(struct net_device *ndev, int budget)
        int     pkt_received = 0;
        u16     queue_id;
        struct fec_enet_private *fep = netdev_priv(ndev);
+       struct fec_enet_priv_rx_q *rxq;
 
        for_each_set_bit(queue_id, &fep->work_rx, FEC_ENET_MAX_RX_QS) {
                clear_bit(queue_id, &fep->work_rx);
-               pkt_received += fec_enet_rx_queue(ndev,
-                                       budget - pkt_received, queue_id);
+               rxq = fep->rx_queue[FEC_ENET_GET_QUQUE(queue_id)];
+               pkt_received += fec_rxq(ndev, fep, rxq, budget - pkt_received);
        }
        return pkt_received;
 }
-- 
2.5.0