diff options
| author | Madalin Bucur <madalin.bucur@freescale.com> | 2013-08-01 14:22:04 (GMT) |
|---|---|---|
| committer | Rivera Jose-B46482 <German.Rivera@freescale.com> | 2013-09-11 23:35:11 (GMT) |
| commit | 8d29a4cb52d75ab3ad3d27b2328c8a1ebd1a4d77 (patch) | |
| tree | e0588e9133385ff948a36088ba91d7c256f176ca /drivers/net | |
| parent | 64ff8c982e3271f7849e8b1db8c2eef2d470a9c3 (diff) | |
| download | linux-fsl-qoriq-8d29a4cb52d75ab3ad3d27b2328c8a1ebd1a4d77.tar.xz | |
dpa_eth: fix function type
The wrong return type of dpa_bp_priv_seed() caused a crash
on the termination optimized driver flavor.
Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
Reviewed-on: http://git.am.freescale.net:8181/3696
Reviewed-by: Sovaiala Cristian-Constantin-B39531 <Cristian.Sovaiala@freescale.com>
Reviewed-by: Radulescu Ruxandra Ioana-B05472 <ruxandra.radulescu@freescale.com>
Reviewed-by: Hamciuc Bogdan-BHAMCIU1 <bogdan.hamciuc@freescale.com>
Change-Id: I538a1529f1c0e27ff5b199e9675a56029f448e64
Reviewed-on: http://git.am.freescale.net:8181/4643
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')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth.h | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth_non_sg.c | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth.h b/drivers/net/ethernet/freescale/dpa/dpaa_eth.h index 77c3269..611e5d8 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth.h +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth.h @@ -456,7 +456,7 @@ struct fm_port_fqs { }; /* functions with different implementation for SG and non-SG: */ -void dpa_bp_priv_seed(struct dpa_bp *dpa_bp); +int dpa_bp_priv_seed(struct dpa_bp *dpa_bp); int dpaa_eth_refill_bpools(struct dpa_percpu_priv_s *percpu_priv); void __hot _dpa_rx(struct net_device *net_dev, const struct dpa_priv_s *priv, diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth_non_sg.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth_non_sg.c index cc687b7..2cfaaa8 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_non_sg.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_non_sg.c @@ -132,7 +132,7 @@ uint32_t dpa_bp_default_buf_size_get(void) return default_buf_size; } -void dpa_bp_priv_seed(struct dpa_bp *dpa_bp) +int dpa_bp_priv_seed(struct dpa_bp *dpa_bp) { int i; dpa_bp->size = default_buf_size; @@ -144,6 +144,7 @@ void dpa_bp_priv_seed(struct dpa_bp *dpa_bp) for (j = 0; j < dpa_bp->target_count; j += 8) dpa_bp_add_8(dpa_bp, i); } + return 0; } void dpa_bp_priv_non_sg_seed(struct dpa_bp *dpa_bp) diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c index ef1d37b..cc76dda 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c @@ -130,7 +130,7 @@ void dpa_bp_add_8_bufs(const struct dpa_bp *dpa_bp, int cpu) *count_ptr += _dpa_bp_add_8_bufs(dpa_bp); } -void dpa_bp_priv_seed(struct dpa_bp *dpa_bp) +int dpa_bp_priv_seed(struct dpa_bp *dpa_bp) { int i; @@ -144,6 +144,7 @@ void dpa_bp_priv_seed(struct dpa_bp *dpa_bp) for (j = 0; j < dpa_bp->config_count; j += 8) dpa_bp_add_8_bufs(dpa_bp, i); } + return 0; } /* Add buffers/(pages) for Rx processing whenever bpool count falls below |