GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-24 07:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: systemport: Utilize skb_put_padto()

Browse source 
Since we need to pad our packets, utilize skb_put_padto() which
increases skb->len by how much we need to pad, allowing us to eliminate
the test on skb->len right below.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2017-01-03 16:34:48 -08:00 • committed by David S. Miller
parent cd7aeb1f97
commit bb7da333d0
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/ethernet/broadcom/bcmsysport.c
View file

@ -1028,13 +1028,12 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,
* (including FCS and tag) because the length verification is done after * (including FCS and tag) because the length verification is done after
* the Broadcom tag is stripped off the ingress packet. * the Broadcom tag is stripped off the ingress packet.
*/ */
if (skb_padto(skb, ETH_ZLEN + ENET_BRCM_TAG_LEN)) { if (skb_put_padto(skb, ETH_ZLEN + ENET_BRCM_TAG_LEN)) {
ret = NETDEV_TX_OK; ret = NETDEV_TX_OK;
goto out; goto out;
} }
skb_len = skb->len < ETH_ZLEN + ENET_BRCM_TAG_LEN ? skb_len = skb->len;
ETH_ZLEN + ENET_BRCM_TAG_LEN : skb->len;
mapping = dma_map_single(kdev, skb->data, skb_len, DMA_TO_DEVICE); mapping = dma_map_single(kdev, skb->data, skb_len, DMA_TO_DEVICE);
if (dma_mapping_error(kdev, mapping)) { if (dma_mapping_error(kdev, mapping)) {