From f1e2792af83d701bb32c036933a7db5bdbc3e205 Mon Sep 17 00:00:00 2001 From: Mallikarjuna R Chilakala Date: Mon, 23 Nov 2009 10:45:11 -0800 Subject: [PATCH] --- yaml --- r: 171807 b: refs/heads/master c: edd2ea5559737e5239d5c80fa1a55b8bc440470b h: refs/heads/master i: 171805: 6cf380636608d88367c83d6982c7ac5aacb4b298 171803: 47a92c197aac4709ada460183087074bc3dcd7cc 171799: 4e7123dda666e3a97ebc069920ded6d49c65e1b2 171791: 250b2bbefcad5c1cb202f759697a1d9835039433 171775: 087aa606f8f6af1430371d602652c5df6ff4ec8d v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 07366e26e5bd..8826414afb38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94b982b2e4be9661fe1c3893aa780a711b09cd30 +refs/heads/master: edd2ea5559737e5239d5c80fa1a55b8bc440470b diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index ffd1f1639706..a3a2a9a3df81 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ixgbe/ixgbe_main.c @@ -2066,18 +2066,18 @@ static u32 ixgbe_setup_mrqc(struct ixgbe_adapter *adapter) * ixgbe_configure_rscctl - enable RSC for the indicated ring * @adapter: address of board private structure * @index: index of ring to set - * @rx_buf_len: rx buffer length **/ -static void ixgbe_configure_rscctl(struct ixgbe_adapter *adapter, int index, - int rx_buf_len) +static void ixgbe_configure_rscctl(struct ixgbe_adapter *adapter, int index) { struct ixgbe_ring *rx_ring; struct ixgbe_hw *hw = &adapter->hw; int j; u32 rscctrl; + int rx_buf_len; rx_ring = &adapter->rx_ring[index]; j = rx_ring->reg_idx; + rx_buf_len = rx_ring->rx_buf_len; rscctrl = IXGBE_READ_REG(hw, IXGBE_RSCCTL(j)); rscctrl |= IXGBE_RSCCTL_RSCEN; /* @@ -2285,7 +2285,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) { /* Enable 82599 HW-RSC */ for (i = 0; i < adapter->num_rx_queues; i++) - ixgbe_configure_rscctl(adapter, i, rx_buf_len); + ixgbe_configure_rscctl(adapter, i); /* Disable RSC for ACK packets */ IXGBE_WRITE_REG(hw, IXGBE_RSCDBU,