From abb363dd15553557738cd97d8f8019f1bf327162 Mon Sep 17 00:00:00 2001 From: Breno Leitao Date: Mon, 8 Jun 2009 10:30:19 +0000 Subject: [PATCH] --- yaml --- r: 150781 b: refs/heads/master c: 25b0b999fbf5cc1893b110d530102951795d2f73 h: refs/heads/master i: 150779: 55301950c2d6c4639acd6f331361d7cf27758bbf v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f5297ce29508..3474c235b17f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d8fd38567729202afd0ff3904c818ed0cb1de52 +refs/heads/master: 25b0b999fbf5cc1893b110d530102951795d2f73 diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c index 391d2d47089c..f99e17e0a319 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/drivers/net/bnx2.c @@ -546,8 +546,7 @@ bnx2_free_rx_mem(struct bnx2 *bp) rxr->rx_desc_mapping[j]); rxr->rx_desc_ring[j] = NULL; } - if (rxr->rx_buf_ring) - vfree(rxr->rx_buf_ring); + vfree(rxr->rx_buf_ring); rxr->rx_buf_ring = NULL; for (j = 0; j < bp->rx_max_pg_ring; j++) { @@ -557,8 +556,7 @@ bnx2_free_rx_mem(struct bnx2 *bp) rxr->rx_pg_desc_mapping[j]); rxr->rx_pg_desc_ring[j] = NULL; } - if (rxr->rx_pg_ring) - vfree(rxr->rx_pg_ring); + vfree(rxr->rx_pg_ring); rxr->rx_pg_ring = NULL; } }