From: Troy Kisky <troy.kisky@boundarydevices.com>
To: netdev@vger.kernel.org, davem@davemloft.net, B38611@freescale.com
Cc: fabio.estevam@freescale.com, l.stach@pengutronix.de,
andrew@lunn.ch, tremyfr@gmail.com, linux@arm.linux.org.uk,
linux-arm-kernel@lists.infradead.org, laci@boundarydevices.com,
shawnguo@kernel.org, johannes@sipsolutions.net,
stillcompiling@gmail.com, sergei.shtylyov@cogentembedded.com,
arnd@arndb.de, Troy Kisky <troy.kisky@boundarydevices.com>
Subject: [PATCH net-next V2 02/16] net: fec: pass rxq to fec_enet_rx_queue instead of queue_id
Date: Wed, 24 Feb 2016 17:36:45 -0700 [thread overview]
Message-ID: <1456360619-24390-3-git-send-email-troy.kisky@boundarydevices.com> (raw)
In-Reply-To: <1456360619-24390-1-git-send-email-troy.kisky@boundarydevices.com>
The queue_id is the qid member of struct bufdesc_prop.
Signed-off-by: Troy Kisky <troy.kisky@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 dbac975..9619b9e 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1328,11 +1328,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;
@@ -1350,8 +1348,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.
@@ -1519,11 +1515,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
next prev parent reply other threads:[~2016-02-25 0:40 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 0:36 [PATCH net-next V2 00/16] net: fec: cleanup and fixes Troy Kisky
2016-02-25 0:36 ` [PATCH net-next V2 01/16] net: fec: only check queue 0 if RXF_0/TXF_0 interrupt is set Troy Kisky
2016-03-02 14:57 ` Fugang Duan
2016-02-25 0:36 ` Troy Kisky [this message]
2016-03-01 21:05 ` [PATCH net-next V2 02/16] net: fec: pass rxq to fec_enet_rx_queue instead of queue_id Zhi Li
2016-03-02 15:01 ` Fugang Duan
2016-02-25 0:36 ` [PATCH net-next V2 03/16] net: fec: pass txq to fec_enet_tx_queue " Troy Kisky
2016-03-01 21:06 ` Zhi Li
2016-03-01 21:51 ` Troy Kisky
2016-03-01 22:26 ` Zhi Li
2016-03-01 22:43 ` Troy Kisky
2016-03-02 15:16 ` Fugang Duan
2016-03-02 16:13 ` Troy Kisky
2016-03-04 7:41 ` Fugang Duan
2016-03-04 16:23 ` Troy Kisky
2016-02-25 0:36 ` [PATCH net-next V2 04/16] net: fec: reduce interrupts Troy Kisky
2016-03-02 15:13 ` Fugang Duan
2016-03-02 16:12 ` Troy Kisky
2016-03-02 16:44 ` Zhi Li
2016-03-02 16:47 ` Zhi Li
2016-03-02 22:32 ` Troy Kisky
2016-03-02 22:52 ` Zhi Li
2016-03-04 8:58 ` Fugang Duan
2016-02-25 0:36 ` [PATCH net-next V2 05/16] net: fec: split off napi routine with 3 queues Troy Kisky
2016-02-25 0:36 ` [PATCH net-next V2 06/16] net: fec: don't clear all rx queue bits when just one is being checked Troy Kisky
2016-03-04 9:11 ` Fugang Duan
2016-03-04 16:18 ` Troy Kisky
2016-03-04 16:38 ` Russell King - ARM Linux
2016-03-04 17:28 ` Troy Kisky
2016-02-25 0:36 ` [PATCH net-next V2 07/16] net: fec: set cbd_sc without relying on previous value Troy Kisky
2016-03-04 9:29 ` Fugang Duan
2016-03-04 16:08 ` Troy Kisky
2016-03-05 23:55 ` Fugang Duan
2016-02-25 0:36 ` [PATCH net-next V2 08/16] net: fec: eliminate calls to fec_enet_get_prevdesc Troy Kisky
2016-03-04 9:33 ` Fugang Duan
2016-03-04 16:05 ` Troy Kisky
2016-02-25 0:36 ` [PATCH net-next V2 09/16] net: fec: move restart test for efficiency Troy Kisky
2016-02-25 0:36 ` [PATCH net-next V2 10/16] net: fec: clear cbd_sc after transmission to help with debugging Troy Kisky
2016-02-25 0:36 ` [PATCH net-next V2 11/16] net: fec: dump all tx queues in fec_dump Troy Kisky
2016-02-25 0:36 ` [PATCH net-next V2 12/16] net: fec: detect tx int lost Troy Kisky
2016-02-25 0:36 ` [PATCH net-next V2 13/16] net: fec: print more debug info in fec_timeout Troy Kisky
2016-03-04 10:06 ` Fugang Duan
2016-03-04 16:05 ` Troy Kisky
2016-03-04 17:35 ` Joe Perches
2016-03-04 19:06 ` Troy Kisky
2016-02-25 0:36 ` [PATCH net-next V2 14/16] net: fec: create subroutine reset_tx_queue Troy Kisky
2016-02-25 0:36 ` [PATCH net-next V2 15/16] net: fec: call dma_unmap_single on mapped tx buffers at restart Troy Kisky
2016-02-25 0:36 ` [PATCH net-next V2 16/16] net: fec: don't set cbd_bufaddr unless no mapping error Troy Kisky
2016-02-25 2:52 ` [PATCH net-next V2 00/16] net: fec: cleanup and fixes Joshua Clayton
2016-02-25 16:05 ` Troy Kisky
2016-02-25 16:49 ` Joshua Clayton
2016-02-25 8:39 ` Holger Schurig
2016-02-25 15:57 ` Troy Kisky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456360619-24390-3-git-send-email-troy.kisky@boundarydevices.com \
--to=troy.kisky@boundarydevices.com \
--cc=B38611@freescale.com \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=fabio.estevam@freescale.com \
--cc=johannes@sipsolutions.net \
--cc=l.stach@pengutronix.de \
--cc=laci@boundarydevices.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux@arm.linux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=shawnguo@kernel.org \
--cc=stillcompiling@gmail.com \
--cc=tremyfr@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).