← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/net/macb.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/macb.c
576
576
                 * add that if/when we get our hands on a full-blown MII PHY.
577
577
                 */
578
578
 
 
579
                if (status & MACB_BIT(ISR_ROVR)) {
 
580
                        /* We missed at least one packet */
 
581
                        bp->hw_stats.rx_overruns++;
 
582
                }
 
583
 
579
584
                if (status & MACB_BIT(HRESP)) {
580
585
                        /*
581
586
                         * TODO: Reset the hardware, and maybe move the printk
1024
1029
                                   hwstat->rx_jabbers +
1025
1030
                                   hwstat->rx_undersize_pkts +
1026
1031
                                   hwstat->rx_length_mismatch);
1027
 
        nstat->rx_over_errors = hwstat->rx_resource_errors;
 
1032
        nstat->rx_over_errors = hwstat->rx_resource_errors +
 
1033
                                   hwstat->rx_overruns;
1028
1034
        nstat->rx_crc_errors = hwstat->rx_fcs_errors;
1029
1035
        nstat->rx_frame_errors = hwstat->rx_align_errors;
1030
1036
        nstat->rx_fifo_errors = hwstat->rx_overruns;
1171
1177
        }
1172
1178
 
1173
1179
        dev->irq = platform_get_irq(pdev, 0);
1174
 
        err = request_irq(dev->irq, macb_interrupt, IRQF_SAMPLE_RANDOM,
1175
 
                          dev->name, dev);
 
1180
        err = request_irq(dev->irq, macb_interrupt, 0, dev->name, dev);
1176
1181
        if (err) {
1177
1182
                printk(KERN_ERR
1178
1183
                       "%s: Unable to request IRQ %d (error %d)\n",
1351
1356
 
1352
1357
MODULE_LICENSE("GPL");
1353
1358
MODULE_DESCRIPTION("Atmel MACB Ethernet driver");
1354
 
MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
 
1359
MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
1355
1360
MODULE_ALIAS("platform:macb");