diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-19 14:17:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-19 14:17:30 -0400 |
commit | abaa72d7fd9a20a67b62e6afa0e746e27851dc33 (patch) | |
tree | ebe4134fcc93a6e205e6004b3e652d7a62281651 /drivers/scsi/bnx2i/bnx2i_hwi.c | |
parent | 67da22d23fa6f3324e03bcd0580b914b2e4afbf3 (diff) | |
parent | 3e4b9459fb0e149c6b74c9e89399a8fc39a92b44 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Diffstat (limited to 'drivers/scsi/bnx2i/bnx2i_hwi.c')
-rw-r--r-- | drivers/scsi/bnx2i/bnx2i_hwi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c index 49e8b056ca10..33d6630529de 100644 --- a/drivers/scsi/bnx2i/bnx2i_hwi.c +++ b/drivers/scsi/bnx2i/bnx2i_hwi.c | |||
@@ -2741,7 +2741,6 @@ int bnx2i_map_ep_dbell_regs(struct bnx2i_endpoint *ep) | |||
2741 | goto arm_cq; | 2741 | goto arm_cq; |
2742 | } | 2742 | } |
2743 | 2743 | ||
2744 | reg_base = ep->hba->netdev->base_addr; | ||
2745 | if ((test_bit(BNX2I_NX2_DEV_5709, &ep->hba->cnic_dev_type)) && | 2744 | if ((test_bit(BNX2I_NX2_DEV_5709, &ep->hba->cnic_dev_type)) && |
2746 | (ep->hba->mail_queue_access == BNX2I_MQ_BIN_MODE)) { | 2745 | (ep->hba->mail_queue_access == BNX2I_MQ_BIN_MODE)) { |
2747 | config2 = REG_RD(ep->hba, BNX2_MQ_CONFIG2); | 2746 | config2 = REG_RD(ep->hba, BNX2_MQ_CONFIG2); |
@@ -2757,7 +2756,7 @@ int bnx2i_map_ep_dbell_regs(struct bnx2i_endpoint *ep) | |||
2757 | /* 5709 device in normal node and 5706/5708 devices */ | 2756 | /* 5709 device in normal node and 5706/5708 devices */ |
2758 | reg_off = CTX_OFFSET + (MB_KERNEL_CTX_SIZE * cid_num); | 2757 | reg_off = CTX_OFFSET + (MB_KERNEL_CTX_SIZE * cid_num); |
2759 | 2758 | ||
2760 | ep->qp.ctx_base = ioremap_nocache(reg_base + reg_off, | 2759 | ep->qp.ctx_base = ioremap_nocache(ep->hba->reg_base + reg_off, |
2761 | MB_KERNEL_CTX_SIZE); | 2760 | MB_KERNEL_CTX_SIZE); |
2762 | if (!ep->qp.ctx_base) | 2761 | if (!ep->qp.ctx_base) |
2763 | return -ENOMEM; | 2762 | return -ENOMEM; |