openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck 2014-12-03 08:17:58 -08:00 committed by David S. Miller
parent 28f7936cdf
commit b0b9f33334
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/myricom/myri10ge/myri10ge.c
View File

@ -2913,17 +2913,12 @@ static netdev_tx_t myri10ge_xmit(struct sk_buff *skb,
flags |= MXGEFW_FLAGS_SMALL; flags |= MXGEFW_FLAGS_SMALL;
/* pad frames to at least ETH_ZLEN bytes */ /* pad frames to at least ETH_ZLEN bytes */
if (unlikely(skb->len < ETH_ZLEN)) { if (eth_skb_pad(skb)) {
if (skb_padto(skb, ETH_ZLEN)) {
/* The packet is gone, so we must /* The packet is gone, so we must
* return 0 */ * return 0 */
ss->stats.tx_dropped += 1; ss->stats.tx_dropped += 1;
return NETDEV_TX_OK; 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 */ /* map the skb for DMA */