[PATCH] fix sun3_82586 using skb_padto

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

Showing with 5 additions and 1 deletion

drivers/net/sun3_82586.c drivers/net/sun3_82586.c +5 -1

No files found.
--- a/drivers/net/sun3_82586.c
+++ b/drivers/net/sun3_82586.c
@@ -1010,8 +1010,12 @@ static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)
 	else
 #endif
 	{
+		len = skb->len;
+		if (len < ETH_ZLEN) {
+			memset((char *)p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN);
+			len = ETH_ZLEN;
+		}
 		memcpy((char *)p->xmit_cbuffs[p->xmit_count],(char *)(skb->data),skb->len);
-		len = (ETH_ZLEN < skb->len) ? skb->len : ETH_ZLEN;
 #if (NUM_XMIT_BUFFS == 1)
 #	ifdef NO_NOPCOMMANDS