← 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/pnic2.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/pnic2.c
125
125
        csr14 |= 0x00001184;
126
126
 
127
127
        if (tulip_debug > 1)
128
 
                printk(KERN_DEBUG "%s: Restarting PNIC2 autonegotiation, csr14=%08x\n",
129
 
                       dev->name, csr14);
 
128
                netdev_dbg(dev, "Restarting PNIC2 autonegotiation, csr14=%08x\n",
 
129
                           csr14);
130
130
 
131
131
        /* tell pnic2_lnk_change we are doing an nway negotiation */
132
132
        dev->if_port = 0;
137
137
 
138
138
        tp->csr6 = ioread32(ioaddr + CSR6);
139
139
        if (tulip_debug > 1)
140
 
                printk(KERN_DEBUG "%s: On Entry to Nway, csr6=%08x\n",
141
 
                       dev->name, tp->csr6);
 
140
                netdev_dbg(dev, "On Entry to Nway, csr6=%08x\n", tp->csr6);
142
141
 
143
142
        /* mask off any bits not to touch
144
143
         * comment at top of file explains mask value
271
270
                        iowrite32(1, ioaddr + CSR13);
272
271
 
273
272
                        if (tulip_debug > 2)
274
 
                                printk(KERN_DEBUG "%s: Setting CSR6 %08x/%x CSR12 %08x\n",
275
 
                                       dev->name, tp->csr6,
276
 
                                       ioread32(ioaddr + CSR6), ioread32(ioaddr + CSR12));
 
273
                                netdev_dbg(dev, "Setting CSR6 %08x/%x CSR12 %08x\n",
 
274
                                           tp->csr6,
 
275
                                           ioread32(ioaddr + CSR6),
 
276
                                           ioread32(ioaddr + CSR12));
277
277
 
278
278
                        /* now the following actually writes out the
279
279
                         * new csr6 values
324
324
                /* Link blew? Maybe restart NWay. */
325
325
 
326
326
                if (tulip_debug > 2)
327
 
                        printk(KERN_DEBUG "%s: Ugh! Link blew?\n", dev->name);
 
327
                        netdev_dbg(dev, "Ugh! Link blew?\n");
328
328
 
329
329
                del_timer_sync(&tp->timer);
330
330
                pnic2_start_nway(dev);