| Message ID | 24f6f0436b4c574b3c2ab83503ba4004078d6dbe.1599685320.git.lorenzo@kernel.org |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: mventa: drop mvneta_stats from mvneta_swbm_rx_frame signature | expand |
From: Lorenzo Bianconi <lorenzo@kernel.org> Date: Wed, 9 Sep 2020 23:05:23 +0200 > Remove mvneta_stats from mvneta_swbm_rx_frame signature since now stats > are accounted in mvneta_run_xdp routine > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Applied, thanks.
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index fa3c0b9f69fe..f75e05e899bb 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2226,8 +2226,7 @@ mvneta_swbm_rx_frame(struct mvneta_port *pp, struct mvneta_rx_desc *rx_desc, struct mvneta_rx_queue *rxq, struct xdp_buff *xdp, int *size, - struct page *page, - struct mvneta_stats *stats) + struct page *page) { unsigned char *data = page_address(page); int data_len = -MVNETA_MH_SIZE, len; @@ -2380,7 +2379,7 @@ static int mvneta_rx_swbm(struct napi_struct *napi, desc_status = rx_desc->status; mvneta_swbm_rx_frame(pp, rx_desc, rxq, &xdp_buf, - &size, page, &ps); + &size, page); } else { if (unlikely(!xdp_buf.data_hard_start)) continue;
Remove mvneta_stats from mvneta_swbm_rx_frame signature since now stats are accounted in mvneta_run_xdp routine Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- drivers/net/ethernet/marvell/mvneta.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)