Commit e5195c1f authored by Stefan Bader's avatar Stefan Bader Committed by David S. Miller

r8169: fix 8168evl frame padding.

Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: hayeswang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b424332d
...@@ -5787,6 +5787,14 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, ...@@ -5787,6 +5787,14 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
goto err_stop_0; 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)) if (unlikely(le32_to_cpu(txd->opts1) & DescOwn))
goto err_stop_0; goto err_stop_0;
...@@ -5858,6 +5866,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, ...@@ -5858,6 +5866,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
rtl8169_unmap_tx_skb(d, tp->tx_skb + entry, txd); rtl8169_unmap_tx_skb(d, tp->tx_skb + entry, txd);
err_dma_0: err_dma_0:
dev_kfree_skb(skb); dev_kfree_skb(skb);
err_update_stats:
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
return NETDEV_TX_OK; return NETDEV_TX_OK;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment