1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 2d849da4c566..2d56d7160a23 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -5779,6 +5779,14 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
                 goto err_stop_0;
         }
 
+        /* 8168evl does not automatically pad to minimum length. */
+        if (unlikely(tp->mac_version == RTL_GIGA_MAC_VER_34 &&
+                     skb->len < ETH_ZLEN)) {
+                if (skb_padto(skb, ETH_ZLEN))
+                        goto err_update_stats;
+                skb_put(skb, ETH_ZLEN - skb->len);
+        }
+
         if (unlikely(le32_to_cpu(txd->opts1) & DescOwn))
                 goto err_stop_0;
 
@@ -5850,6 +5858,7 @@ err_dma_1:
         rtl8169_unmap_tx_skb(d, tp->tx_skb + entry, txd);
 err_dma_0:
         dev_kfree_skb(skb);
+err_update_stats:
         dev->stats.tx_dropped++;
         return NETDEV_TX_OK;