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);