diff options
| author | Madalin Bucur <madalin.bucur@freescale.com> | 2013-09-11 08:24:43 (GMT) |
|---|---|---|
| committer | Rivera Jose-B46482 <German.Rivera@freescale.com> | 2013-09-11 23:27:02 (GMT) |
| commit | 53fb5c007ea674ca4a140973ca6d4dd40e0dea6c (patch) | |
| tree | 4742e491ff673158d798050eaaf13b7caf51654c /drivers/net/ethernet/freescale/dpa/dpaa_eth_unit_test.c | |
| parent | c363705a1f72ab6185f069993e62a37131d65475 (diff) | |
| download | linux-fsl-qoriq-53fb5c007ea674ca4a140973ca6d4dd40e0dea6c.tar.xz | |
dpaa_eth: revert driver code to last known good state
Undoing the merge conflict artifacts, out of order and incomplete
patch application code changes. This reverts the sdk-kernel-3.8
branch to the state at 70c2c840d8ff41359aafd7f510144c235a32fce1.
Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
Change-Id: Ib7282b356eeb38884fce716e247620c431bd3c72
Reviewed-on: http://git.am.freescale.net:8181/4642
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com>
Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/dpa/dpaa_eth_unit_test.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth_unit_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth_unit_test.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth_unit_test.c index 08f9001..62095a7 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_unit_test.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_unit_test.c @@ -283,7 +283,7 @@ static int dpa_tx_unit_test(struct net_device *net_dev) } /* Was it good? */ - if (!tx_unit_test_passed) { + if (tx_unit_test_passed == false) { pr_err("Test failed:\n"); pr_err("size: %d pad: %d head: %p end: %p\n", size, headroom, tx_unit_skb_head, @@ -364,7 +364,7 @@ void dpa_unit_test_drain_default_pool(struct net_device *net_dev) default_pool->size, DMA_BIDIRECTIONAL); - dpa_bp->free_buf_cb(phys_to_virt(addr)); + _dpa_bp_free_buf(phys_to_virt(addr)); } } while (num == 8); |