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

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

net: systemport: Utilize skb_put_padto() 



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

drivers/net/ethernet/broadcom/bcmsysport.c

+2 −3
Original line number Diff line number Diff line
@@ -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

	 * 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;

		goto out;

	}



	skb_len = skb->len < ETH_ZLEN + ENET_BRCM_TAG_LEN ?

			ETH_ZLEN + ENET_BRCM_TAG_LEN : skb->len;

	skb_len = skb->len;



	mapping = dma_map_single(kdev, skb->data, skb_len, DMA_TO_DEVICE);

	if (dma_mapping_error(kdev, mapping)) {