Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b65eef0a authored by Varun Prakash's avatar Varun Prakash Committed by David S. Miller
Browse files

libcxgb,iw_cxgb4,cxgbit: add cxgb_is_neg_adv() 



Add cxgb_is_neg_adv() in libcxgb_cm.h to remove
it's duplicate definitions from cxgb4/cm.c and
cxgbit/cxgbit_cm.c.

Signed-off-by: default avatarVarun Prakash <varun@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 95554761

drivers/infiniband/hw/cxgb4/cm.c

+3 −12
Original line number Diff line number Diff line
@@ -1987,15 +1987,6 @@ static inline int act_open_has_tid(int status) 
		status != CPL_ERR_CONN_EXIST);

}



/* Returns whether a CPL status conveys negative advice.

 */

static int is_neg_adv(unsigned int status)

{

	return status == CPL_ERR_RTX_NEG_ADVICE ||

	       status == CPL_ERR_PERSIST_NEG_ADVICE ||

	       status == CPL_ERR_KEEPALV_NEG_ADVICE;

}



static char *neg_adv_str(unsigned int status)

{

	switch (status) {
@@ -2235,7 +2226,7 @@ static int act_open_rpl(struct c4iw_dev *dev, struct sk_buff *skb) 
	PDBG("%s ep %p atid %u status %u errno %d\n", __func__, ep, atid,

	     status, status2errno(status));



	if (is_neg_adv(status)) {

	if (cxgb_is_neg_adv(status)) {

		PDBG("%s Connection problems for atid %u status %u (%s)\n",

		     __func__, atid, status, neg_adv_str(status));

		ep->stats.connect_neg_adv++;
@@ -2751,7 +2742,7 @@ static int peer_abort(struct c4iw_dev *dev, struct sk_buff *skb) 
	if (!ep)

		return 0;



	if (is_neg_adv(req->status)) {

	if (cxgb_is_neg_adv(req->status)) {

		PDBG("%s Negative advice on abort- tid %u status %d (%s)\n",

		     __func__, ep->hwtid, req->status,

		     neg_adv_str(req->status));
@@ -4227,7 +4218,7 @@ static int peer_abort_intr(struct c4iw_dev *dev, struct sk_buff *skb) 
		kfree_skb(skb);

		return 0;

	}

	if (is_neg_adv(req->status)) {

	if (cxgb_is_neg_adv(req->status)) {

		PDBG("%s Negative advice on abort- tid %u status %d (%s)\n",

		     __func__, ep->hwtid, req->status,

		     neg_adv_str(req->status));

drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.h

+9 −0
Original line number Diff line number Diff line
@@ -47,4 +47,13 @@ struct dst_entry * 
cxgb_find_route6(struct cxgb4_lld_info *,

		 struct net_device *(*)(struct net_device *),

		 __u8 *, __u8 *, __be16, __be16, u8, __u32);



/* Returns whether a CPL status conveys negative advice.

 */

static inline bool cxgb_is_neg_adv(unsigned int status)

{

	return status == CPL_ERR_RTX_NEG_ADVICE ||

	       status == CPL_ERR_PERSIST_NEG_ADVICE ||

	       status == CPL_ERR_KEEPALV_NEG_ADVICE;

}

#endif

drivers/target/iscsi/cxgbit/cxgbit_cm.c

+1 −10
Original line number Diff line number Diff line
@@ -73,15 +73,6 @@ cxgbit_wait_for_reply(struct cxgbit_device *cdev, 
	return wr_waitp->ret;

}



/* Returns whether a CPL status conveys negative advice.

 */

static int cxgbit_is_neg_adv(unsigned int status)

{

	return status == CPL_ERR_RTX_NEG_ADVICE ||

		status == CPL_ERR_PERSIST_NEG_ADVICE ||

		status == CPL_ERR_KEEPALV_NEG_ADVICE;

}



static int cxgbit_np_hashfn(const struct cxgbit_np *cnp)

{

	return ((unsigned long)cnp >> 10) & (NP_INFO_HASH_SIZE - 1);
@@ -1704,7 +1695,7 @@ static void cxgbit_abort_req_rss(struct cxgbit_sock *csk, struct sk_buff *skb) 
	pr_debug("%s: csk %p; tid %u; state %d\n",

		 __func__, csk, tid, csk->com.state);



	if (cxgbit_is_neg_adv(hdr->status)) {

	if (cxgb_is_neg_adv(hdr->status)) {

		pr_err("%s: got neg advise %d on tid %u\n",

		       __func__, hdr->status, tid);

		goto rel_skb;