Replace the open-coded skb_pad() + __skb_put() sequence in fm10k_xmit_frame() with skb_put_padto(). Signed-off-by: Eric Dumazet --- Cc: Tony Nguyen Cc: Przemek Kitszel Cc: Andrew Lunn --- Part of a medium term plan to get rid of skb_pad(), source of many mistakes. drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c index c86701be4364aeae2831d8551b0012ab27b4bfa7..669a02c6415c65a37e43cb283cc24f57b31dd770 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c @@ -561,13 +561,8 @@ static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev) /* The minimum packet size for a single buffer is 17B so pad the skb * in order to meet this minimum size requirement. */ - if (unlikely(skb->len < 17)) { - int pad_len = 17 - skb->len; - - if (skb_pad(skb, pad_len)) - return NETDEV_TX_OK; - __skb_put(skb, pad_len); - } + if (skb_put_padto(skb, 17)) + return NETDEV_TX_OK; if (r_idx >= num_tx_queues) r_idx %= num_tx_queues; -- 2.53.0