[PATCH] fix lp486e using skb_padto

e7851533 · Alan Cox · Linus Torvalds · d530fb24 · e7851533
Commit e7851533 authored Jan 10, 2003 by Alan Cox Committed by Linus Torvalds Jan 10, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

drivers/net/lp486e.c drivers/net/lp486e.c +9 -1

No files found.
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -885,7 +885,15 @@ i596_start_xmit (struct sk_buff *skb, struct net_device *dev) {
 	if (skb->len <= 0)
 		return 0;
-	length = (ETH_ZLEN < skb->len) ? skb->len : ETH_ZLEN;
+	length = skb->len;
+	if (length < ETH_ZLEN) {
+		skb = skb_padto(skb, ETH_ZLEN);
+		if (skb == NULL)
+			return 0;
+		length = ETH_ZLEN;
+	}
 	dev->trans_start = jiffies;
 	tx_cmd = (struct tx_cmd *)