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

Commit a546e557 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: r6040: Utilize skb_put_padto() 



Pad the SKB to the minimum length of ETH_ZLEN by using skb_put_padto()
and take this operation out of the critical section since there is no
need to check any HW resources before doing that.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7def171d

drivers/net/ethernet/rdc/r6040.c

+4 −5
Original line number Diff line number Diff line
@@ -815,6 +815,9 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb, 
	void __iomem *ioaddr = lp->base;

	unsigned long flags;



	if (skb_put_padto(skb, ETH_ZLEN) < 0)

		return NETDEV_TX_OK;



	/* Critical Section */

	spin_lock_irqsave(&lp->lock, flags);
@@ -829,11 +832,7 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb, 
	/* Set TX descriptor & Transmit it */

	lp->tx_free_desc--;

	descptr = lp->tx_insert_ptr;

	if (skb->len < ETH_ZLEN)

		descptr->len = ETH_ZLEN;

	else

	descptr->len = skb->len;



	descptr->skb_ptr = skb;

	descptr->buf = cpu_to_le32(pci_map_single(lp->pdev,

		skb->data, skb->len, PCI_DMA_TODEVICE));