← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to drivers/net/tulip/pnic.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/tulip/pnic.c
40
40
                        new_csr6 |= 0x00000200;
41
41
                }
42
42
                if (tulip_debug > 1)
43
 
                        printk(KERN_DEBUG "%s: PNIC autonegotiated status %08x, %s\n",
44
 
                               dev->name, phy_reg, medianame[dev->if_port]);
 
43
                        netdev_dbg(dev, "PNIC autonegotiated status %08x, %s\n",
 
44
                                   phy_reg, medianame[dev->if_port]);
45
45
                if (tp->csr6 != new_csr6) {
46
46
                        tp->csr6 = new_csr6;
47
47
                        /* Restart Tx */
58
58
        int phy_reg = ioread32(ioaddr + 0xB8);
59
59
 
60
60
        if (tulip_debug > 1)
61
 
                printk(KERN_DEBUG "%s: PNIC link changed state %08x, CSR5 %08x\n",
62
 
                       dev->name, phy_reg, csr5);
 
61
                netdev_dbg(dev, "PNIC link changed state %08x, CSR5 %08x\n",
 
62
                           phy_reg, csr5);
63
63
        if (ioread32(ioaddr + CSR5) & TPLnkFail) {
64
64
                iowrite32((ioread32(ioaddr + CSR7) & ~TPLnkFail) | TPLnkPass, ioaddr + CSR7);
65
65
                /* If we use an external MII, then we mustn't use the
114
114
                int csr5 = ioread32(ioaddr + CSR5);
115
115
 
116
116
                if (tulip_debug > 1)
117
 
                        printk(KERN_DEBUG "%s: PNIC timer PHY status %08x, %s CSR5 %08x\n",
118
 
                               dev->name, phy_reg, medianame[dev->if_port], csr5);
 
117
                        netdev_dbg(dev, "PNIC timer PHY status %08x, %s CSR5 %08x\n",
 
118
                                   phy_reg, medianame[dev->if_port], csr5);
119
119
                if (phy_reg & 0x04000000) {     /* Remote link fault */
120
120
                        iowrite32(0x0201F078, ioaddr + 0xB8);
121
121
                        next_tick = 1*HZ;
125
125
                        next_tick = 60*HZ;
126
126
                } else if (csr5 & TPLnkFail) { /* 100baseTx link beat */
127
127
                        if (tulip_debug > 1)
128
 
                                printk(KERN_DEBUG "%s: %s link beat failed, CSR12 %04x, CSR5 %08x, PHY %03x\n",
129
 
                                       dev->name, medianame[dev->if_port],
130
 
                                       csr12,
131
 
                                       ioread32(ioaddr + CSR5),
132
 
                                       ioread32(ioaddr + 0xB8));
 
128
                                netdev_dbg(dev, "%s link beat failed, CSR12 %04x, CSR5 %08x, PHY %03x\n",
 
129
                                           medianame[dev->if_port],
 
130
                                           csr12,
 
131
                                           ioread32(ioaddr + CSR5),
 
132
                                           ioread32(ioaddr + 0xB8));
133
133
                        next_tick = 3*HZ;
134
134
                        if (tp->medialock) {
135
135
                        } else if (tp->nwayset  &&  (dev->if_port & 1)) {