From 064d851c32d53b26a596898ca802bb027dc963c1 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 29 Nov 2006 13:15:17 -0800
Subject: [PATCH] --- yaml --- r: 41535 b: refs/heads/master c:
 bca79eb7e7a1855947864952fcd878a5ae7b5c92 h: refs/heads/master i:   41533:
 d21b520fa46e9da4b0e027a3b5526f153a5fbc80   41531:
 c56790152cbb3284ce169c81210af1d314126ff1   41527:
 614006aa54805e7a66072ae4817154e586ee8c41   41519:
 e937fcbc4b9540beca995b8a8c5a5cbca441df1a   41503:
 17f2ad42948c5009a6d11d4563b0c327281c36f8   41471:
 8672d418fa543721992796f417ca025975cb169c v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/sundance.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1da2374a009d..870fb66fbc95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb8011ad53e0855ef088e0e5a4bcb98fa90c70b6
+refs/heads/master: bca79eb7e7a1855947864952fcd878a5ae7b5c92
diff --git a/trunk/drivers/net/sundance.c b/trunk/drivers/net/sundance.c
index 02679e688c4c..c06ecc8002b9 100644
--- a/trunk/drivers/net/sundance.c
+++ b/trunk/drivers/net/sundance.c
@@ -1102,7 +1102,7 @@ reset_tx (struct net_device *dev)
 	np->cur_tx = np->dirty_tx = 0;
 	np->cur_task = 0;
 
-	np->last_tx = 0;
+	np->last_tx = NULL;
 	iowrite8(127, ioaddr + TxDMAPollPeriod);
 
 	iowrite16 (StatsEnable | RxEnable | TxEnable, ioaddr + MACCtrl1);
@@ -1648,7 +1648,7 @@ static int netdev_close(struct net_device *dev)
 	np->cur_tx = 0;
 	np->dirty_tx = 0;
 	np->cur_task = 0;
-	np->last_tx = 0;
+	np->last_tx = NULL;
 
 	netif_stop_queue(dev);