diff options
| author | Madalin Bucur <madalin.bucur@freescale.com> | 2013-07-15 14:29:59 (GMT) |
|---|---|---|
| committer | Fleming Andrew-AFLEMING <AFLEMING@freescale.com> | 2013-07-15 21:06:06 (GMT) |
| commit | 8a665e8ac3b040a1f2763627068c4e0229250b9c (patch) | |
| tree | 742f69703e479123e440e91956ecdb404c23b8a3 /drivers/net/ethernet/freescale/fman/Kconfig | |
| parent | 66425bae51b45f3cf4a41605b8a3cfa8c9fc1de9 (diff) | |
| download | linux-fsl-qoriq-8a665e8ac3b040a1f2763627068c4e0229250b9c.tar.xz | |
dpaa_eth: undo merge on master branch
One of the merged patches was no longer needed and the rest
break a large set of patches already prepared for review.
The required patches are available on top of the large patch set.
Revert "dpaa_eth: Handle buffer pool depletion"
This reverts commit 1fd9018f9c6a10932e86285c256bfdf50da8c0c1.
Revert "dpaa_eth: Fix pool counters on error path"
This reverts commit e8a66453a9b71d4d5290bd4962cc6ec2fda1b848.
Revert "dpaa_eth: Switch compile-time default optimization"
This reverts commit 47a79e454a7f54b96b3133e139e707944375edca.
Revert "fmd,dpaa_eth: Selectively reenable FMan allocation algorithm"
This reverts commit 3cc98fd0b85bdb61f83672fdc4609b68f0c7a75f.
Revert "dpaa_eth: Fix endless loop in case of memory depletion"
This reverts commit b676b243d7ccdd4879ea8c5fb74a6d3e2a7f2e5e.
Revert "dpaa_eth: Set a fixed upper limit for recycleable buffer size"
This reverts commit 252b622b8058a309d2429a33c2e0de089be896ac.
Revert "dpaa_eth: Fix computation of cache padding"
This reverts commit a3b310dbe6d25132698a88618e7ef52bc6749177.
Revert "dpaa_eth: Fix Tx/TxConfirm initialization bug"
This reverts commit 429d9f28709eb7c916d4c6da4cccfae33906c510.
Change-Id: I22765f8406f43bb2c7d84fbf5fdb67c74697a008
Reviewed-on: http://git.am.freescale.net:8181/3305
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fman/Kconfig b/drivers/net/ethernet/freescale/fman/Kconfig index ec7449f..a6d52e5 100644 --- a/drivers/net/ethernet/freescale/fman/Kconfig +++ b/drivers/net/ethernet/freescale/fman/Kconfig @@ -34,7 +34,7 @@ endmenu config FMAN_RESOURCE_ALLOCATION_ALGORITHM bool "Enable FMan dynamic resource allocation algorithm" - default y if ((FMAN_P3040_P4080_P5020 || FMAN_P1023) && FSL_DPAA_ETH_OPTIMIZE_FOR_IPFWD) + default n ---help--- Enables algorithm for dynamic resource allocation |