Commit 0eb484ee authored by Allen Pais's avatar Allen Pais Committed by Jakub Kicinski

cxgb4: convert tasklets to use new tasklet_setup() API

In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.
Signed-off-by: default avatarRomain Perier <romain.perier@gmail.com>
Signed-off-by: default avatarAllen Pais <apais@linux.microsoft.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fd15dd05
...@@ -2111,7 +2111,7 @@ void free_tx_desc(struct adapter *adap, struct sge_txq *q, ...@@ -2111,7 +2111,7 @@ void free_tx_desc(struct adapter *adap, struct sge_txq *q,
void cxgb4_eosw_txq_free_desc(struct adapter *adap, struct sge_eosw_txq *txq, void cxgb4_eosw_txq_free_desc(struct adapter *adap, struct sge_eosw_txq *txq,
u32 ndesc); u32 ndesc);
int cxgb4_ethofld_send_flowc(struct net_device *dev, u32 eotid, u32 tc); int cxgb4_ethofld_send_flowc(struct net_device *dev, u32 eotid, u32 tc);
void cxgb4_ethofld_restart(unsigned long data); void cxgb4_ethofld_restart(struct tasklet_struct *t);
int cxgb4_ethofld_rx_handler(struct sge_rspq *q, const __be64 *rsp, int cxgb4_ethofld_rx_handler(struct sge_rspq *q, const __be64 *rsp,
const struct pkt_gl *si); const struct pkt_gl *si);
void free_txq(struct adapter *adap, struct sge_txq *q); void free_txq(struct adapter *adap, struct sge_txq *q);
......
...@@ -114,8 +114,7 @@ static int cxgb4_init_eosw_txq(struct net_device *dev, ...@@ -114,8 +114,7 @@ static int cxgb4_init_eosw_txq(struct net_device *dev,
eosw_txq->cred = adap->params.ofldq_wr_cred; eosw_txq->cred = adap->params.ofldq_wr_cred;
eosw_txq->hwqid = hwqid; eosw_txq->hwqid = hwqid;
eosw_txq->netdev = dev; eosw_txq->netdev = dev;
tasklet_init(&eosw_txq->qresume_tsk, cxgb4_ethofld_restart, tasklet_setup(&eosw_txq->qresume_tsk, cxgb4_ethofld_restart);
(unsigned long)eosw_txq);
return 0; return 0;
} }
......
...@@ -3887,9 +3887,10 @@ static int napi_rx_handler(struct napi_struct *napi, int budget) ...@@ -3887,9 +3887,10 @@ static int napi_rx_handler(struct napi_struct *napi, int budget)
return work_done; return work_done;
} }
void cxgb4_ethofld_restart(unsigned long data) void cxgb4_ethofld_restart(struct tasklet_struct *t)
{ {
struct sge_eosw_txq *eosw_txq = (struct sge_eosw_txq *)data; struct sge_eosw_txq *eosw_txq = from_tasklet(eosw_txq, t,
qresume_tsk);
int pktcount; int pktcount;
spin_lock(&eosw_txq->lock); spin_lock(&eosw_txq->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment