← Back to branch summary

~ubuntu-branches/ubuntu/lucid/linux-rt/lucid

« back to all changes in this revision

Viewing changes to drivers/net/qla3xxx.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-08-05 23:00:52 UTC
  • Revision ID: james.westby@ubuntu.com-20090805230052-7xedvqcyk9dnnxb2
Tags: 2.6.31-1.1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/qla3xxx.c
2292
2292
 
2293
2293
        if (tx_cleaned + rx_cleaned != budget) {
2294
2294
                spin_lock_irqsave(&qdev->hw_lock, hw_flags);
2295
 
                __netif_rx_complete(napi);
 
2295
                __napi_complete(napi);
2296
2296
                ql_update_small_bufq_prod_index(qdev);
2297
2297
                ql_update_lrg_bufq_prod_index(qdev);
2298
2298
                writel(qdev->rsp_consumer_index,
2351
2351
                spin_unlock(&qdev->adapter_lock);
2352
2352
        } else if (value & ISP_IMR_DISABLE_CMPL_INT) {
2353
2353
                ql_disable_interrupts(qdev);
2354
 
                if (likely(netif_rx_schedule_prep(&qdev->napi))) {
2355
 
                        __netif_rx_schedule(&qdev->napi);
 
2354
                if (likely(napi_schedule_prep(&qdev->napi))) {
 
2355
                        __napi_schedule(&qdev->napi);
2356
2356
                }
2357
2357
        } else {
2358
2358
                return IRQ_NONE;
2617
2617
                            &port_regs->CommonRegs.reqQProducerIndex,
2618
2618
                            qdev->req_producer_index);
2619
2619
 
2620
 
        ndev->trans_start = jiffies;
2621
2620
        if (netif_msg_tx_queued(qdev))
2622
2621
                printk(KERN_DEBUG PFX "%s: tx queued, slot %d, len %d\n",
2623
2622
                       ndev->name, qdev->req_producer_index, skb->len);
3143
3142
                                                (void __iomem *)port_regs;
3144
3143
        u32 delay = 10;
3145
3144
        int status = 0;
 
3145
        unsigned long hw_flags = 0;
3146
3146
 
3147
3147
        if(ql_mii_setup(qdev))
3148
3148
                return -1;
3151
3151
        ql_write_common_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg,
3152
3152
                            (ISP_SERIAL_PORT_IF_WE |
3153
3153
                             (ISP_SERIAL_PORT_IF_WE << 16)));
3154
 
 
 
3154
        /* Give the PHY time to come out of reset. */
 
3155
        mdelay(100);
3155
3156
        qdev->port_link_state = LS_DOWN;
3156
3157
        netif_carrier_off(qdev->ndev);
3157
3158
 
3351
3352
                value = ql_read_page0_reg(qdev, &port_regs->portStatus);
3352
3353
                if (value & PORT_STATUS_IC)
3353
3354
                        break;
 
3355
                spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
3354
3356
                msleep(500);
 
3357
                spin_lock_irqsave(&qdev->hw_lock, hw_flags);
3355
3358
        } while (--delay);
3356
3359
 
3357
3360
        if (delay == 0) {
3838
3841
                                                      16) | ISP_CONTROL_RI));
3839
3842
                        }
3840
3843
 
 
3844
                        spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
3841
3845
                        ssleep(1);
 
3846
                        spin_lock_irqsave(&qdev->hw_lock, hw_flags);
3842
3847
                } while (--max_wait_time);
3843
3848
                spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
3844
3849
 
3934
3939
 
3935
3940
        pci_set_master(pdev);
3936
3941
 
3937
 
        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
 
3942
        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
3938
3943
                pci_using_dac = 1;
3939
 
                err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
3940
 
        } else if (!(err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
 
3944
                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
 
3945
        } else if (!(err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
3941
3946
                pci_using_dac = 0;
3942
 
                err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
 
3947
                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
3943
3948
        }
3944
3949
 
3945
3950
        if (err) {