Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d74c96c1 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by David S. Miller
Browse files

net: mvpp2: Fix the BM pool buffer release check 



After a call to mvpp2_bm_bufs_free(), the caller usually wants to know
if the function successfully freed the requested number. However, this
cannot be done by looking into the BM pool count, because the current
buffer count was updated by mvpp2_bm_bufs_free().

In fact, the current callers of mvpp2_bm_bufs_free() use it to release
all the buffers in the pool, so we can fix this by simply checking
if the pool is not empty.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 08a23755

drivers/net/ethernet/marvell/mvpp2.c

+3 −3
Original line number Diff line number Diff line
@@ -3420,7 +3420,7 @@ static int mvpp2_bm_pool_destroy(struct platform_device *pdev, 
	u32 val;



	num = mvpp2_bm_bufs_free(priv, bm_pool, bm_pool->buf_num);

	if (num != bm_pool->buf_num) {

	if (bm_pool->buf_num) {

		WARN(1, "cannot free all buffers in pool %d\n", bm_pool->id);

		return 0;

	}
@@ -3748,8 +3748,8 @@ static int mvpp2_bm_update_mtu(struct net_device *dev, int mtu) 
	int pkt_size = MVPP2_RX_PKT_SIZE(mtu);



	/* Update BM pool with new buffer size */

	num = mvpp2_bm_bufs_free(port->priv, port_pool, pkts_num);

	if (num != pkts_num) {

	mvpp2_bm_bufs_free(port->priv, port_pool, pkts_num);

	if (port_pool->buf_num) {

		WARN(1, "cannot free all buffers in pool %d\n", port_pool->id);

		return -EIO;

	}