summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorMadalin Bucur <madalin.bucur@freescale.com>2013-08-01 14:22:04 (GMT)
committerRivera Jose-B46482 <German.Rivera@freescale.com>2013-09-10 20:07:49 (GMT)
commitac4faf6b8e25308efd3027ff258e9d522709b79f (patch)
tree0b68abfd96bb34efe6af96d190bd98110bfb20ee /drivers/net
parent78f1554f2ac9a8a3dd622fa49f4623cddba9e036 (diff)
downloadlinux-fsl-qoriq-ac4faf6b8e25308efd3027ff258e9d522709b79f.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> Change-Id: I22cec61c063a901a4d8fd40653fb4fe2cba31435 Reviewed-on: http://git.am.freescale.net:8181/3696 Reviewed-by: Sovaiala Cristian-Constantin-B39531 <Cristian.Sovaiala@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Radulescu Ruxandra Ioana-B05472 <ruxandra.radulescu@freescale.com> Reviewed-by: Hamciuc Bogdan-BHAMCIU1 <bogdan.hamciuc@freescale.com> Reviewed-by: Rivera Jose-B46482 <Jose.G.Rivera@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/4457 Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/freescale/dpa/dpaa_eth.h2
-rw-r--r--drivers/net/ethernet/freescale/dpa/dpaa_eth_non_sg.c3
-rw-r--r--drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c3
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 4f743c3..a677af2 100644
--- a/drivers/net/ethernet/freescale/dpa/dpaa_eth.h
+++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth.h
@@ -475,7 +475,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 428553a..3bcb5b3 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 a593882..1114940 100644
--- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c
+++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c
@@ -132,7 +132,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;
@@ -147,6 +147,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;
}
/*