diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-10-05 17:57:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-05 18:19:22 -0700 |
| commit | 53954cf8c5d205624167a2bfd117cc0c1a5f3c6d (patch) | |
| tree | a287f0c80eb616758bb5212523c8fb3d8fc350a4 /drivers/net/ethernet/aquantia/atlantic/aq_vec.c | |
| parent | Merge branch 'bpftool' (diff) | |
| parent | Merge tag 'pm-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| download | linux-dev-53954cf8c5d205624167a2bfd117cc0c1a5f3c6d.tar.xz linux-dev-53954cf8c5d205624167a2bfd117cc0c1a5f3c6d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aquantia/atlantic/aq_vec.c')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c index ebf588004c46..305ff8ffac2c 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c @@ -59,12 +59,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget) if (ring[AQ_VEC_TX_ID].sw_head != ring[AQ_VEC_TX_ID].hw_head) { aq_ring_tx_clean(&ring[AQ_VEC_TX_ID]); - - if (aq_ring_avail_dx(&ring[AQ_VEC_TX_ID]) > - AQ_CFG_SKB_FRAGS_MAX) { - aq_nic_ndev_queue_start(self->aq_nic, - ring[AQ_VEC_TX_ID].idx); - } + aq_ring_update_queue_state(&ring[AQ_VEC_TX_ID]); was_tx_cleaned = true; } @@ -364,6 +359,7 @@ void aq_vec_add_stats(struct aq_vec_s *self, stats_tx->packets += tx->packets; stats_tx->bytes += tx->bytes; stats_tx->errors += tx->errors; + stats_tx->queue_restarts += tx->queue_restarts; } } |