Skip to content

Commit

Permalink
be2net: Fix early reset of rx-completion
Browse files Browse the repository at this point in the history
be_rx_compl_get() must not reset(via the valid word) the rx_compl as the rx_compl is not processed yet; it must be reset after it is processed.

Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sathya Perla authored and David S. Miller committed Jun 11, 2009
1 parent 76fbb42 commit a7a0ef3
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions drivers/net/benet/be_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -876,12 +876,19 @@ static struct be_eth_rx_compl *be_rx_compl_get(struct be_adapter *adapter)

be_dws_le_to_cpu(rxcp, sizeof(*rxcp));

rxcp->dw[offsetof(struct amap_eth_rx_compl, valid) / 32] = 0;

queue_tail_inc(&adapter->rx_obj.cq);
return rxcp;
}

/* To reset the valid bit, we need to reset the whole word as
* when walking the queue the valid entries are little-endian
* and invalid entries are host endian
*/
static inline void be_rx_compl_reset(struct be_eth_rx_compl *rxcp)
{
rxcp->dw[offsetof(struct amap_eth_rx_compl, valid) / 32] = 0;
}

static inline struct page *be_alloc_pages(u32 size)
{
gfp_t alloc_flags = GFP_ATOMIC;
Expand Down Expand Up @@ -1013,6 +1020,7 @@ static void be_rx_q_clean(struct be_adapter *adapter)
/* First cleanup pending rx completions */
while ((rxcp = be_rx_compl_get(adapter)) != NULL) {
be_rx_compl_discard(adapter, rxcp);
be_rx_compl_reset(rxcp);
be_cq_notify(&adapter->ctrl, rx_cq->id, true, 1);
}

Expand Down Expand Up @@ -1294,6 +1302,8 @@ int be_poll_rx(struct napi_struct *napi, int budget)
be_rx_compl_process_lro(adapter, rxcp);
else
be_rx_compl_process(adapter, rxcp);

be_rx_compl_reset(rxcp);
}

lro_flush_all(&adapter->rx_obj.lro_mgr);
Expand Down

0 comments on commit a7a0ef3

Please sign in to comment.