From d437cf03a80a8086236ddd977efe36d5c9c380b2 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Wed, 2 Dec 2009 15:15:35 +0000 Subject: [PATCH] --- yaml --- r: 172095 b: refs/heads/master c: c7596b79feb3d15bea64007254f77233bda811f4 h: refs/heads/master i: 172093: 33cd8444a4486420f3e6610cc3649ff3784859e5 172091: 2c4d1e60471978714c03cbf03a414992b327519b 172087: 012ad5b1a20130d79d24170eb91d74997362cee4 172079: 7b3f1adf41634383235828ed2fdfe2bc7c80c5a4 172063: 14c777999e061cab152c2923fd307a842a4a2e44 172031: 34ad129cbe3263332d7c25d3650418a7c72dbeae v: v3 --- [refs] | 2 +- trunk/drivers/net/cnic.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 168f078cb16b..43730e39b300 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f9b3f69944ab7eacb9273b4723087c42b5f4046 +refs/heads/master: c7596b79feb3d15bea64007254f77233bda811f4 diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c index ee7eb9ee77e2..10c5cc356305 100644 --- a/trunk/drivers/net/cnic.c +++ b/trunk/drivers/net/cnic.c @@ -4131,22 +4131,20 @@ static void cnic_init_rings(struct cnic_dev *dev) cnic_init_bnx2_rx_ring(dev); } else if (test_bit(CNIC_F_BNX2X_CLASS, &dev->flags)) { struct cnic_local *cp = dev->cnic_priv; - struct cnic_eth_dev *ethdev = cp->ethdev; u32 cli = BNX2X_ISCSI_CL_ID(CNIC_E1HVN(cp)); union l5cm_specific_data l5_data; struct ustorm_eth_rx_producers rx_prods = {0}; - void __iomem *doorbell; - int i; + u32 off, i; rx_prods.bd_prod = 0; rx_prods.cqe_prod = BNX2X_MAX_RCQ_DESC_CNT; barrier(); - doorbell = ethdev->io_base2 + BAR_USTRORM_INTMEM + + off = BAR_USTRORM_INTMEM + USTORM_RX_PRODS_OFFSET(CNIC_PORT(cp), cli); for (i = 0; i < sizeof(struct ustorm_eth_rx_producers) / 4; i++) - writel(((u32 *) &rx_prods)[i], doorbell + i * 4); + CNIC_WR(dev, off + i * 4, ((u32 *) &rx_prods)[i]); cnic_init_bnx2x_tx_ring(dev); cnic_init_bnx2x_rx_ring(dev);