diff options
| author | Roland Dreier <rdreier@cisco.com> | 2009-07-09 09:30:25 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-09 17:16:06 -0700 |
| commit | e594e96e8a14101a6decabf6746bd5186287debc (patch) | |
| tree | e5ad4ab49c5e575e9d3cdbd845dd4fe53f0c7892 | |
| parent | 8faa2a786a5337683109d77ccf880339fdcdb332 (diff) | |
| download | op-kernel-dev-e594e96e8a14101a6decabf6746bd5186287debc.zip op-kernel-dev-e594e96e8a14101a6decabf6746bd5186287debc.tar.gz | |
cxgb3: Fix crash caused by stashing wrong netdev_queue
Commit c3a8c5b6 ("cxgb3: move away from LLTX") exposed a bug in how
cxgb3 looks up the netdev_queue it stashes away in a qset during
initialization. For multiport devices, the TX queue index it uses is
offset by the first_qset index of each port. This leads to a crash
once LLTX is removed, since hard_start_xmit is called with one TX
queue lock held, while the TX reclaim timer task grabs a different
(wrong) TX queue lock when it frees skbs.
Fix this by removing the first_qset offset used to look up the TX
queue passed into t3_sge_alloc_qset() from setup_sge_qsets().
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Acked-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 538dda4..fb5df5c 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c @@ -642,8 +642,7 @@ static int setup_sge_qsets(struct adapter *adap) struct port_info *pi = netdev_priv(dev); pi->qs = &adap->sge.qs[pi->first_qset]; - for (j = pi->first_qset; j < pi->first_qset + pi->nqsets; - ++j, ++qset_idx) { + for (j = 0; j < pi->nqsets; ++j, ++qset_idx) { set_qset_lro(dev, qset_idx, pi->rx_offload & T3_LRO); err = t3_sge_alloc_qset(adap, qset_idx, 1, (adap->flags & USING_MSIX) ? qset_idx + 1 : |
