← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/r6040.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/r6040.c
535
535
                        /* RX dribble */
536
536
                        if (err & DSC_RX_ERR_DRI)
537
537
                                dev->stats.rx_frame_errors++;
538
 
                        /* Buffer lenght exceeded */
 
538
                        /* Buffer length exceeded */
539
539
                        if (err & DSC_RX_ERR_BUF)
540
540
                                dev->stats.rx_length_errors++;
541
541
                        /* Packet too long */
677
677
                if (status & RX_FIFO_FULL)
678
678
                        dev->stats.rx_fifo_errors++;
679
679
 
680
 
                /* Mask off RX interrupt */
681
 
                misr &= ~RX_INTS;
682
 
                napi_schedule(&lp->napi);
 
680
                if (likely(napi_schedule_prep(&lp->napi))) {
 
681
                        /* Mask off RX interrupt */
 
682
                        misr &= ~RX_INTS;
 
683
                        __napi_schedule(&lp->napi);
 
684
                }
683
685
        }
684
686
 
685
687
        /* TX interrupt request */