diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2016-07-04 14:36:03 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-07-05 00:10:29 -0700 |
| commit | a546e557d9404834159b0599a4383ff4cd3321bf (patch) | |
| tree | b89c64bfd5f6c2ee79b2f527741cf52037cde950 /drivers | |
| parent | net: r6040: Increase statistics upon transmit completion (diff) | |
| download | linux-dev-a546e557d9404834159b0599a4383ff4cd3321bf.tar.xz linux-dev-a546e557d9404834159b0599a4383ff4cd3321bf.zip | |
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: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/rdc/r6040.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c index 75776eee36f9..46ed093348da 100644 --- a/drivers/net/ethernet/rdc/r6040.c +++ b/drivers/net/ethernet/rdc/r6040.c @@ -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->len = skb->len; descptr->skb_ptr = skb; descptr->buf = cpu_to_le32(pci_map_single(lp->pdev, skb->data, skb->len, PCI_DMA_TODEVICE)); |