Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2003-11-22 17:48:24 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2003-11-22 17:48:24 -0800
commit16154e7245fa86af2a5bbd2d276b0767845212d3 (patch)
tree772bacb5751f4feb29c418949979ca44f54645b6
parentf6967f9af223616129208dcc9f614cb24742088f (diff)
parent9bd9c5e1134cbd3623df378fdc85ced70a27983e (diff)
Merge bk://gkernel.bkbits.net/net-drivers-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
-rw-r--r--drivers/net/sis190.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index aabe5f3bdd71..da4ea1b59eaa 100644
--- 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;
}