| Message ID | 20100218093603.GA28912@serverengines.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Sathya Perla <sathyap@serverengines.com> Date: Thu, 18 Feb 2010 15:06:03 +0530 > In cases like when a pci device is disconnected after a pci error, > pending tx completions will never arrive. Unmap and free such > buffers in the tx cleanup path. > > Signed-off-by: Sathya Perla <sathyap@serverengines.com> > --- > drivers/net/benet/be_main.c | 12 ++++++++++++ > 1 files changed, 12 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c > index 68e7848..810d2a4 100644 > --- a/drivers/net/benet/be_main.c > +++ b/drivers/net/benet/be_main.c > @@ -1128,6 +1128,9 @@ static void be_tx_compl_clean(struct be_adapter *adapter) > struct be_queue_info *txq = &adapter->tx_obj.q; > struct be_eth_tx_compl *txcp; > u16 end_idx, cmpl = 0, timeo = 0; > + struct sk_buff **sent_skbs = adapter->tx_obj.sent_skb_list; > + struct sk_buff *sent_skb; > + bool dummy_wrb; Some of your lines start with tabs, some with spaces. You have to use tabs consistently. > + > + /* free posted tx for which compls will never arrive */ > + while (atomic_read(&txq->used)) { > + sent_skb = sent_skbs[txq->tail]; > + end_idx = txq->tail; > + index_adv(&end_idx, > + wrb_cnt_for_skb(sent_skb, &dummy_wrb) - 1, txq->len); > + be_tx_compl_process(adapter, end_idx); > + } > } More tabbing and indentation problems here too. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 68e7848..810d2a4 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -1128,6 +1128,9 @@ static void be_tx_compl_clean(struct be_adapter *adapter) struct be_queue_info *txq = &adapter->tx_obj.q; struct be_eth_tx_compl *txcp; u16 end_idx, cmpl = 0, timeo = 0; + struct sk_buff **sent_skbs = adapter->tx_obj.sent_skb_list; + struct sk_buff *sent_skb; + bool dummy_wrb; /* Wait for a max of 200ms for all the tx-completions to arrive. */ do { @@ -1151,6 +1154,15 @@ static void be_tx_compl_clean(struct be_adapter *adapter) if (atomic_read(&txq->used)) dev_err(&adapter->pdev->dev, "%d pending tx-completions\n", atomic_read(&txq->used)); + + /* free posted tx for which compls will never arrive */ + while (atomic_read(&txq->used)) { + sent_skb = sent_skbs[txq->tail]; + end_idx = txq->tail; + index_adv(&end_idx, + wrb_cnt_for_skb(sent_skb, &dummy_wrb) - 1, txq->len); + be_tx_compl_process(adapter, end_idx); + } } static void be_mcc_queues_destroy(struct be_adapter *adapter)
In cases like when a pci device is disconnected after a pci error, pending tx completions will never arrive. Unmap and free such buffers in the tx cleanup path. Signed-off-by: Sathya Perla <sathyap@serverengines.com> --- drivers/net/benet/be_main.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)