From: "Tham, Mun Yew" <mun.yew.t...@intel.com>
commit 122520a53a4bc247a186a53f37eb2f1f5df21de6 from
https://github.com/altera-opensource/linux-socfpga.git
Fix the multiple definitions of alloc_init_skbufs
and free_skbufs between intel_fpga_qse_ll_main.c
and altera_tse_main.c
Signed-off-by: Tham, Mun Yew <mun.yew.t...@intel.com>
Signed-off-by: Wenlin Kang <wenlin.k...@windriver.com>
---
drivers/net/ethernet/altera/intel_fpga_qse_ll_main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/altera/intel_fpga_qse_ll_main.c
b/drivers/net/ethernet/altera/intel_fpga_qse_ll_main.c
index 7665cf639db5..97c6a2fbaf1e 100644
--- a/drivers/net/ethernet/altera/intel_fpga_qse_ll_main.c
+++ b/drivers/net/ethernet/altera/intel_fpga_qse_ll_main.c
@@ -153,7 +153,7 @@ static void qse_free_tx_buffer(struct
intel_fpga_qse_private *priv,
}
}
-int alloc_init_skbufs(struct intel_fpga_qse_private *priv)
+int qse_alloc_init_skbufs(struct intel_fpga_qse_private *priv)
{
unsigned int rx_descs = priv->dma_priv.rx_ring_size;
unsigned int tx_descs = priv->dma_priv.tx_ring_size;
@@ -205,7 +205,7 @@ int alloc_init_skbufs(struct intel_fpga_qse_private *priv)
return ret;
}
-void free_skbufs(struct net_device *dev)
+void qse_free_skbufs(struct net_device *dev)
{
struct intel_fpga_qse_private *priv = netdev_priv(dev);
unsigned int rx_descs = priv->dma_priv.rx_ring_size;
@@ -1016,7 +1016,7 @@ static int qse_open(struct net_device *dev)
priv->dmaops->reset_dma(&priv->dma_priv);
- ret = alloc_init_skbufs(priv);
+ ret = qse_alloc_init_skbufs(priv);
if (ret) {
netdev_err(dev, "DMA descriptors initialization failed\n");
goto alloc_skbuf_error;
@@ -1072,7 +1072,7 @@ static int qse_open(struct net_device *dev)
return 0;
init_error:
- free_skbufs(dev);
+ qse_free_skbufs(dev);
alloc_skbuf_error:
phy_error:
return ret;
@@ -1111,7 +1111,7 @@ static int qse_shutdown(struct net_device *dev)
*/
if (ret)
netdev_dbg(dev, "Cannot reset MAC core (error: %d)\n", ret);
- free_skbufs(dev);
+ qse_free_skbufs(dev);
spin_unlock(&priv->tx_lock);
spin_unlock(&priv->mac_cfg_lock);
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12510):
https://lists.yoctoproject.org/g/linux-yocto/message/12510
Mute This Topic: https://lists.yoctoproject.org/mt/98898744/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
