Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a102fe0 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by David S. Miller
Browse files

gianfar: Factor out RX BDs initialization from gfar_new_rxbdp() 



We want to just reinitialize RX BDs after hibernation, no need to
map the skb->data again. So let's factor gfar_init_rxbdp() out of
gfar_new_rxbdp().

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32c513bc

drivers/net/gianfar.c

+21 −12
Original line number Diff line number Diff line
@@ -147,6 +147,23 @@ MODULE_AUTHOR("Freescale Semiconductor, Inc"); 
MODULE_DESCRIPTION("Gianfar Ethernet Driver");

MODULE_LICENSE("GPL");



static void gfar_init_rxbdp(struct net_device *dev, struct rxbd8 *bdp,

			    dma_addr_t buf)

{

	struct gfar_private *priv = netdev_priv(dev);

	u32 lstatus;



	bdp->bufPtr = buf;



	lstatus = BD_LFLAG(RXBD_EMPTY | RXBD_INTERRUPT);

	if (bdp == priv->rx_bd_base + priv->rx_ring_size - 1)

		lstatus |= BD_LFLAG(RXBD_WRAP);



	eieio();



	bdp->lstatus = lstatus;

}



static int gfar_alloc_skb_resources(struct net_device *ndev)

{

	struct txbd8 *txbdp;
@@ -1676,19 +1693,11 @@ static void gfar_new_rxbdp(struct net_device *dev, struct rxbd8 *bdp, 
		struct sk_buff *skb)

{

	struct gfar_private *priv = netdev_priv(dev);

	u32 lstatus;

	dma_addr_t buf;



	bdp->bufPtr = dma_map_single(&priv->ofdev->dev, skb->data,

	buf = dma_map_single(&priv->ofdev->dev, skb->data,

			     priv->rx_buffer_size, DMA_FROM_DEVICE);



	lstatus = BD_LFLAG(RXBD_EMPTY | RXBD_INTERRUPT);



	if (bdp == priv->rx_bd_base + priv->rx_ring_size - 1)

		lstatus |= BD_LFLAG(RXBD_WRAP);



	eieio();



	bdp->lstatus = lstatus;

	gfar_init_rxbdp(dev, bdp, buf);

}