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

Commit b0b9f333 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

myri10ge: use eth_skb_pad helper 



Update myri10ge to use eth_skb_pad helper.  This also corrects a minor
issue as the driver was updating length without updating the tail pointer.

Cc: Hyong-Youb Kim <hykim@myri.com>
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28f7936c

drivers/net/ethernet/myricom/myri10ge/myri10ge.c

+5 −10
Original line number Diff line number Diff line
@@ -2913,17 +2913,12 @@ static netdev_tx_t myri10ge_xmit(struct sk_buff *skb, 
		flags |= MXGEFW_FLAGS_SMALL;



		/* pad frames to at least ETH_ZLEN bytes */

		if (unlikely(skb->len < ETH_ZLEN)) {

			if (skb_padto(skb, ETH_ZLEN)) {

		if (eth_skb_pad(skb)) {

			/* The packet is gone, so we must

			 * return 0 */

			ss->stats.tx_dropped += 1;

			return NETDEV_TX_OK;

		}

			/* adjust the len to account for the zero pad

			 * so that the nic can know how long it is */

			skb->len = ETH_ZLEN;

		}

	}



	/* map the skb for DMA */