2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
index b1e190779073..d6681edb7014 100644
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
@@ -162,6 +162,14 @@ static int efx_enqueue_skb(struct efx_tx_queue *tx_queue,
         /* Get size of the initial fragment */
         len = skb_headlen(skb);
 
+        /* Pad if necessary */
+        if (EFX_WORKAROUND_15592(efx) && skb->len <= 32) {
+                EFX_BUG_ON_PARANOID(skb->data_len);
+                len = 32 + 1;
+                if (skb_pad(skb, len - skb->len))
+                        return NETDEV_TX_OK;
+        }
+
         fill_level = tx_queue->insert_count - tx_queue->old_read_count;
         q_space = efx->type->txd_ring_mask - 1 - fill_level;
 
diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/sfc/workarounds.h
index 78de68f4a95b..c821c15445a0 100644
--- a/drivers/net/sfc/workarounds.h
+++ b/drivers/net/sfc/workarounds.h
@@ -36,6 +36,8 @@
 #define EFX_WORKAROUND_11482 EFX_WORKAROUND_ALWAYS
 /* Flush events can take a very long time to appear */
 #define EFX_WORKAROUND_11557 EFX_WORKAROUND_ALWAYS
+/* Truncated IPv4 packets can confuse the TX packet parser */
+#define EFX_WORKAROUND_15592 EFX_WORKAROUND_ALWAYS
 
 /* Spurious parity errors in TSORT buffers */
 #define EFX_WORKAROUND_5129 EFX_WORKAROUND_FALCON_A