Merge bk://gkernel.bkbits.net/net-drivers-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

Merge bk://gkernel.bkbits.net/net-drivers-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
16154e72 · Linus Torvalds · f6967f9a · 9bd9c5e1 · 16154e72
Commit 16154e72 authored Nov 22, 2003 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

drivers/net/sis190.c drivers/net/sis190.c +2 -1

No files found.
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -949,7 +949,8 @@ SiS190_start_xmit(struct sk_buff *skb, struct net_device *dev)

 drop_tx:
 	tp->stats.tx_dropped++;
-	dev_kfree_skb(skb);
+	if (skb)
+		dev_kfree_skb(skb);
 	return 0;
 }