Skip to content

Commit

Permalink
gianfar: Factor out RX BDs initialization from gfar_new_rxbdp()
Browse files Browse the repository at this point in the history
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: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Anton Vorontsov authored and David S. Miller committed Oct 13, 2009
1 parent 32c513b commit 8a102fe
Showing 1 changed file with 21 additions and 12 deletions.
33 changes: 21 additions & 12 deletions drivers/net/gianfar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

bdp->bufPtr = dma_map_single(&priv->ofdev->dev, skb->data,
priv->rx_buffer_size, DMA_FROM_DEVICE);

lstatus = BD_LFLAG(RXBD_EMPTY | RXBD_INTERRUPT);
dma_addr_t buf;

if (bdp == priv->rx_bd_base + priv->rx_ring_size - 1)
lstatus |= BD_LFLAG(RXBD_WRAP);

eieio();

bdp->lstatus = lstatus;
buf = dma_map_single(&priv->ofdev->dev, skb->data,
priv->rx_buffer_size, DMA_FROM_DEVICE);
gfar_init_rxbdp(dev, bdp, buf);
}


Expand Down

0 comments on commit 8a102fe

Please sign in to comment.