nfp: simplify nfp_net_poll()

There are few variables in nfp_net_poll() which are used only
once or unused but set.  Remove them.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2016-10-31 20:43:09 +00:00 committed by David S. Miller
parent 6d052e9abd
commit 7ff5c83a1d

View File

@ -1525,21 +1525,15 @@ static int nfp_net_poll(struct napi_struct *napi, int budget)
{ {
struct nfp_net_r_vector *r_vec = struct nfp_net_r_vector *r_vec =
container_of(napi, struct nfp_net_r_vector, napi); container_of(napi, struct nfp_net_r_vector, napi);
struct nfp_net_rx_ring *rx_ring = r_vec->rx_ring;
struct nfp_net_tx_ring *tx_ring = r_vec->tx_ring;
struct nfp_net *nn = r_vec->nfp_net;
struct netdev_queue *txq;
unsigned int pkts_polled; unsigned int pkts_polled;
tx_ring = &nn->tx_rings[rx_ring->idx]; nfp_net_tx_complete(r_vec->tx_ring);
txq = netdev_get_tx_queue(nn->netdev, tx_ring->idx);
nfp_net_tx_complete(tx_ring);
pkts_polled = nfp_net_rx(rx_ring, budget); pkts_polled = nfp_net_rx(r_vec->rx_ring, budget);
if (pkts_polled < budget) { if (pkts_polled < budget) {
napi_complete_done(napi, pkts_polled); napi_complete_done(napi, pkts_polled);
nfp_net_irq_unmask(nn, r_vec->irq_idx); nfp_net_irq_unmask(r_vec->nfp_net, r_vec->irq_idx);
} }
return pkts_polled; return pkts_polled;