diff options
Diffstat (limited to 'drivers/net/tulip/21142.c')
-rw-r--r-- | drivers/net/tulip/21142.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/tulip/21142.c b/drivers/net/tulip/21142.c index 007d8e75666d..092c3faa882a 100644 --- a/drivers/net/tulip/21142.c +++ b/drivers/net/tulip/21142.c | |||
@@ -122,8 +122,8 @@ void t21142_start_nway(struct net_device *dev) | |||
122 | tp->nway = tp->mediasense = 1; | 122 | tp->nway = tp->mediasense = 1; |
123 | tp->nwayset = tp->lpar = 0; | 123 | tp->nwayset = tp->lpar = 0; |
124 | if (tulip_debug > 1) | 124 | if (tulip_debug > 1) |
125 | printk(KERN_DEBUG "%s: Restarting 21143 autonegotiation, csr14=%08x\n", | 125 | netdev_dbg(dev, "Restarting 21143 autonegotiation, csr14=%08x\n", |
126 | dev->name, csr14); | 126 | csr14); |
127 | iowrite32(0x0001, ioaddr + CSR13); | 127 | iowrite32(0x0001, ioaddr + CSR13); |
128 | udelay(100); | 128 | udelay(100); |
129 | iowrite32(csr14, ioaddr + CSR14); | 129 | iowrite32(csr14, ioaddr + CSR14); |
@@ -206,14 +206,14 @@ void t21142_lnk_change(struct net_device *dev, int csr5) | |||
206 | #if 0 /* Restart shouldn't be needed. */ | 206 | #if 0 /* Restart shouldn't be needed. */ |
207 | iowrite32(tp->csr6 | RxOn, ioaddr + CSR6); | 207 | iowrite32(tp->csr6 | RxOn, ioaddr + CSR6); |
208 | if (tulip_debug > 2) | 208 | if (tulip_debug > 2) |
209 | printk(KERN_DEBUG "%s: Restarting Tx and Rx, CSR5 is %08x\n", | 209 | netdev_dbg(dev, " Restarting Tx and Rx, CSR5 is %08x\n", |
210 | dev->name, ioread32(ioaddr + CSR5)); | 210 | ioread32(ioaddr + CSR5)); |
211 | #endif | 211 | #endif |
212 | tulip_start_rxtx(tp); | 212 | tulip_start_rxtx(tp); |
213 | if (tulip_debug > 2) | 213 | if (tulip_debug > 2) |
214 | printk(KERN_DEBUG "%s: Setting CSR6 %08x/%x CSR12 %08x\n", | 214 | netdev_dbg(dev, " Setting CSR6 %08x/%x CSR12 %08x\n", |
215 | dev->name, tp->csr6, ioread32(ioaddr + CSR6), | 215 | tp->csr6, ioread32(ioaddr + CSR6), |
216 | ioread32(ioaddr + CSR12)); | 216 | ioread32(ioaddr + CSR12)); |
217 | } else if ((tp->nwayset && (csr5 & 0x08000000) && | 217 | } else if ((tp->nwayset && (csr5 & 0x08000000) && |
218 | (dev->if_port == 3 || dev->if_port == 5) && | 218 | (dev->if_port == 3 || dev->if_port == 5) && |
219 | (csr12 & 2) == 2) || | 219 | (csr12 & 2) == 2) || |