Merge redhat.com:/spare/repo/linux-2.5

into redhat.com:/spare/repo/libata-2.5

Merge redhat.com:/spare/repo/linux-2.5
into redhat.com:/spare/repo/libata-2.5
2cb1b24d · Jeff Garzik · da7c7841 · a3d93eb3 · 2cb1b24d · 2cb1b24d
Commit 2cb1b24d authored Nov 24, 2003 by Jeff Garzik
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Makefile Makefile +1 -1

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

No files found.
--- a/Makefile
+++ b/Makefile
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 0
-EXTRAVERSION = -test9
+EXTRAVERSION = -test10
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"

--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -949,6 +949,7 @@ SiS190_start_xmit(struct sk_buff *skb, struct net_device *dev)
 drop_tx:
 	tp->stats.tx_dropped++;
+	if (skb)
 		dev_kfree_skb(skb);
 	return 0;
 }