diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-08-22 23:57:59 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-08-22 23:57:59 +0200 |
| commit | e3dbc572fe11a5231568e106fa3dcedd1d1bec0f (patch) | |
| tree | 5e15ee35c77e75d51cb550cb3cb0f6ecafa7b508 /drivers/net/ethernet/sfc/tx.c | |
| parent | Merge tag 'kvm-arm-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | KVM: PPC: Book3S: correct width in XER handling (diff) | |
| download | linux-e3dbc572fe11a5231568e106fa3dcedd1d1bec0f.tar.xz linux-e3dbc572fe11a5231568e106fa3dcedd1d1bec0f.zip | |
Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue
Patch queue for ppc - 2015-08-22
Highlights for KVM PPC this time around:
- Book3S: A few bug fixes
- Book3S: Allow micro-threading on POWER8
Diffstat (limited to 'drivers/net/ethernet/sfc/tx.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/tx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c index aaf2987512b5..1833a0146571 100644 --- a/drivers/net/ethernet/sfc/tx.c +++ b/drivers/net/ethernet/sfc/tx.c @@ -617,7 +617,8 @@ void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index) EFX_BUG_ON_PARANOID(index > tx_queue->ptr_mask); efx_dequeue_buffers(tx_queue, index, &pkts_compl, &bytes_compl); - netdev_tx_completed_queue(tx_queue->core_txq, pkts_compl, bytes_compl); + tx_queue->pkts_compl += pkts_compl; + tx_queue->bytes_compl += bytes_compl; if (pkts_compl > 1) ++tx_queue->merge_events; |