aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ks8851.c
diff options
context:
space:
mode:
authorTristram Ha <Tristram.Ha@micrel.com>2009-12-03 06:06:42 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-03 19:04:25 -0500
commit3320eae51d6e4c65b4733bf4d87de3b833973a1f (patch)
tree49f79a539dc3f1286654570bdd11543bed8e39d7 /drivers/net/ks8851.c
parentfc4a7489663250360cd40d5adf06a08d1c5d54df (diff)
net: Fix ks8851 snl NULL pointer dereference Oops
This fixes the NULL pointer dereference Oops in the ks8851 snl network driver during transmission. All socket buffers from the queue are processed inside the loop, but new workqueues have been scheduled to run. Signed-off-by: Tristram Ha <Tristram.Ha@micrel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ks8851.c')
-rw-r--r--drivers/net/ks8851.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ks8851.c b/drivers/net/ks8851.c
index a23f739d222f..6d3ac65bc35c 100644
--- a/drivers/net/ks8851.c
+++ b/drivers/net/ks8851.c
@@ -1,4 +1,4 @@
1/* drivers/net/ks8651.c 1/* drivers/net/ks8851.c
2 * 2 *
3 * Copyright 2009 Simtec Electronics 3 * Copyright 2009 Simtec Electronics
4 * http://www.simtec.co.uk/ 4 * http://www.simtec.co.uk/
@@ -714,7 +714,7 @@ static void ks8851_tx_work(struct work_struct *work)
714{ 714{
715 struct ks8851_net *ks = container_of(work, struct ks8851_net, tx_work); 715 struct ks8851_net *ks = container_of(work, struct ks8851_net, tx_work);
716 struct sk_buff *txb; 716 struct sk_buff *txb;
717 bool last = false; 717 bool last = skb_queue_empty(&ks->txq);
718 718
719 mutex_lock(&ks->lock); 719 mutex_lock(&ks->lock);
720 720