be2net: Fix be_tx_q_clean() being called on freed queues
Subsystems (2)
PATCH 5/5 be2net: Fix be_tx_q_clean() being called on freed queues
In the tx queue destroy path, be_tx_q_clean() is currently called after the tx queues are freed; it must be called before.
Signed-off-by Sathya Perla <[email protected]>
--- drivers/net/benet/be_main.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
drivers/net/benet/be_main.c +6 -5
@@ -1056,8 +1056,13 @@ static void be_tx_queues_destroy(struct be_adapter *adapter)struct be_queue_info *q; q = &adapter->tx_obj.q; -if (q->created) +if (q->created) {be_cmd_q_destroy (&adapter->ctrl, q,QTYPE_TXQ ); + +/* No more tx completions can be rcvd now; clean up if there +* are any pending completions or pending tx requests */ +be_tx_q_clean (adapter); + }be_queue_free (adapter, q); q = &adapter->tx_obj.cq;
@@ -1065,10 +1070,6 @@ static void be_tx_queues_destroy(struct be_adapter *adapter)be_cmd_q_destroy (&adapter->ctrl, q,QTYPE_CQ );be_queue_free (adapter, q); -/* No more tx completions can be rcvd now; clean up if there are -* any pending completions or pending tx requests */ -be_tx_q_clean (adapter); - q = &adapter->tx_eq.q;if (q->created)be_cmd_q_destroy (&adapter->ctrl, q,QTYPE_EQ );
Signature · 1 line
1.6.0.4
From: Sathya Perla <[email protected]>
Date: Wed, 10 Jun 2009 17:53:50 +0530
Quoted 3 lines
In the tx queue destroy path,
be_tx_q_clean()is currently called after the tx queues are freed; it must be called before.Signed-off-by Sathya Perla <[email protected]>
Applied.