diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-26 16:32:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-26 16:32:51 -0700 |
| commit | b08866f42a8752ea2b699dd29d653d86b06bc3b2 (patch) | |
| tree | 57d16b10cc704cb6ad3632962205f810aa1c683d /drivers/net/ethernet/aquantia/atlantic/aq_ring.c | |
| parent | e562d0868e04ee353a24dccb9d76f2489fff8e5f (diff) | |
| parent | 4378b882bf03f2e0471b7d92fa97a7227ff3a126 (diff) | |
Merge branch 'net-atlantic-various-non-functional-changes'
Igor Russkikh says:
====================
net: atlantic: various non-functional changes
This patchset contains several non-functional changes, which were made in
out of tree driver over the time.
Mostly typos, checkpatch findings and comment fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aquantia/atlantic/aq_ring.c')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c index 68fdb3994088..8dd59e9fc3aa 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c @@ -1,7 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-only -/* - * aQuantia Corporation Network Driver - * Copyright (C) 2014-2019 aQuantia Corporation. All rights reserved +/* Atlantic Network Driver + * + * Copyright (C) 2014-2019 aQuantia Corporation + * Copyright (C) 2019-2020 Marvell International Ltd. */ /* File aq_ring.c: Definition of functions for Rx/Tx rings. */ @@ -279,7 +280,7 @@ bool aq_ring_tx_clean(struct aq_ring_s *self) } if (unlikely(buff->is_eop)) { - ++self->stats.rx.packets; + ++self->stats.tx.packets; self->stats.tx.bytes += buff->skb->len; dev_kfree_skb_any(buff->skb); @@ -489,6 +490,7 @@ err_exit: void aq_ring_hwts_rx_clean(struct aq_ring_s *self, struct aq_nic_s *aq_nic) { +#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK) while (self->sw_head != self->hw_head) { u64 ns; @@ -500,6 +502,7 @@ void aq_ring_hwts_rx_clean(struct aq_ring_s *self, struct aq_nic_s *aq_nic) self->sw_head = aq_ring_next_dx(self, self->sw_head); } +#endif } int aq_ring_rx_fill(struct aq_ring_s *self) |