Skip to content

Commit

Permalink
net: mvpp2: Fix the BM pool buffer release check
Browse files Browse the repository at this point in the history
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: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ezequiel Garcia authored and David S. Miller committed Jul 23, 2014
1 parent 08a2375 commit d74c96c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/ethernet/marvell/mvpp2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit d74c96c

Please sign in to comment.