openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

IB/rxe: Remove unnecessary rxe variable 

The variable rxe in the function is not used. So it is removed.

Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Zhu Yanjun 2019-01-20 08:21:40 -05:00 committed by Jason Gunthorpe
parent 57b26497fa
commit 9802c335e7
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/infiniband/sw/rxe/rxe_comp.c
View File

@ -146,8 +146,7 @@ void retransmit_timer(struct timer_list *t)
} }
} }
void rxe_comp_queue_pkt(struct rxe_dev *rxe, struct rxe_qp *qp, void rxe_comp_queue_pkt(struct rxe_qp *qp, struct sk_buff *skb)
struct sk_buff *skb)
{ {
int must_sched; int must_sched;
@ -155,7 +154,8 @@ void rxe_comp_queue_pkt(struct rxe_dev *rxe, struct rxe_qp *qp,
must_sched = skb_queue_len(&qp->resp_pkts) > 1; must_sched = skb_queue_len(&qp->resp_pkts) > 1;
if (must_sched != 0) if (must_sched != 0)
rxe_counter_inc(rxe, RXE_CNT_COMPLETER_SCHED); rxe_counter_inc(SKB_TO_PKT(skb)->rxe, RXE_CNT_COMPLETER_SCHED);
rxe_run_task(&qp->comp.task, must_sched); rxe_run_task(&qp->comp.task, must_sched);
} }

6
drivers/infiniband/sw/rxe/rxe_loc.h
View File

@ -239,11 +239,9 @@ int rxe_responder(void *arg);
u32 rxe_icrc_hdr(struct rxe_pkt_info *pkt, struct sk_buff *skb); u32 rxe_icrc_hdr(struct rxe_pkt_info *pkt, struct sk_buff *skb);
void rxe_resp_queue_pkt(struct rxe_dev *rxe, void rxe_resp_queue_pkt(struct rxe_qp *qp, struct sk_buff *skb);
struct rxe_qp *qp, struct sk_buff *skb);
void rxe_comp_queue_pkt(struct rxe_dev *rxe, void rxe_comp_queue_pkt(struct rxe_qp *qp, struct sk_buff *skb);
struct rxe_qp *qp, struct sk_buff *skb);
static inline unsigned int wr_opcode_mask(int opcode, struct rxe_qp *qp) static inline unsigned int wr_opcode_mask(int opcode, struct rxe_qp *qp)
{ {

12
drivers/infiniband/sw/rxe/rxe_recv.c
View File

@ -266,14 +266,12 @@ static int hdr_check(struct rxe_pkt_info *pkt)
return -EINVAL; return -EINVAL;
} }
static inline void rxe_rcv_pkt(struct rxe_dev *rxe, static inline void rxe_rcv_pkt(struct rxe_pkt_info *pkt, struct sk_buff *skb)
struct rxe_pkt_info *pkt,
struct sk_buff *skb)
{ {
if (pkt->mask & RXE_REQ_MASK) if (pkt->mask & RXE_REQ_MASK)
rxe_resp_queue_pkt(rxe, pkt->qp, skb); rxe_resp_queue_pkt(pkt->qp, skb);
else else
rxe_comp_queue_pkt(rxe, pkt->qp, skb); rxe_comp_queue_pkt(pkt->qp, skb);
} }
static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb) static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)
@ -319,7 +317,7 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)
pkt->qp = qp; pkt->qp = qp;
rxe_add_ref(qp); rxe_add_ref(qp);
rxe_rcv_pkt(rxe, pkt, skb); rxe_rcv_pkt(pkt, skb);
} }
spin_unlock_bh(&mcg->mcg_lock); spin_unlock_bh(&mcg->mcg_lock);
@ -411,7 +409,7 @@ void rxe_rcv(struct sk_buff *skb)
if (unlikely(bth_qpn(pkt) == IB_MULTICAST_QPN)) if (unlikely(bth_qpn(pkt) == IB_MULTICAST_QPN))
rxe_rcv_mcast_pkt(rxe, skb); rxe_rcv_mcast_pkt(rxe, skb);
else else
rxe_rcv_pkt(rxe, pkt, skb); rxe_rcv_pkt(pkt, skb);
return; return;

3
drivers/infiniband/sw/rxe/rxe_resp.c
View File

@ -104,8 +104,7 @@ static char *resp_state_name[] = {
}; };
/* rxe_recv calls here to add a request packet to the input queue */ /* rxe_recv calls here to add a request packet to the input queue */
void rxe_resp_queue_pkt(struct rxe_dev *rxe, struct rxe_qp *qp, void rxe_resp_queue_pkt(struct rxe_qp *qp, struct sk_buff *skb)
struct sk_buff *skb)
{ {
int must_sched; int must_sched;
struct rxe_pkt_info *pkt = SKB_TO_PKT(skb); struct rxe_pkt_info *pkt = SKB_TO_PKT(skb);