| Message ID | 1393828875-13452-10-git-send-email-hariprasad@chelsio.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 03/03/2014 09:40 AM, Hariprasad Shenai wrote: > From: Steve Wise <swise@opengridcomputing.com> > Based on original work by Anand Priyadarshee <anandp@chelsio.com>. > Signed-off-by: Steve Wise <swise@opengridcomputing.com> > --- > drivers/infiniband/hw/cxgb4/cm.c | 25 +++++++++++++------------ > drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 1 + > 2 files changed, 14 insertions(+), 12 deletions(-) > diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c > index 74a2250..9387f74 100644 > --- a/drivers/infiniband/hw/cxgb4/cm.c > +++ b/drivers/infiniband/hw/cxgb4/cm.c > @@ -1648,6 +1648,16 @@ static inline int act_open_has_tid(int status) > status != CPL_ERR_ARP_MISS; > } > > +/* > + * Returns whether a CPL status conveys negative advice. Could fix the comment style to comply with the networking coding standards while at it. > + */ > +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; > +} > + > #define ACT_OPEN_RETRY_COUNT 2 > > static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, [...] > @@ -2266,15 +2276,6 @@ static int peer_close(struct c4iw_dev *dev, struct sk_buff *skb) > return 0; > } > > -/* > - * Returns whether an ABORT_REQ_RSS message is a negative advice. > - */ > -static int is_neg_adv_abort(unsigned int status) > -{ > - return status == CPL_ERR_RTX_NEG_ADVICE || > - status == CPL_ERR_PERSIST_NEG_ADVICE; > -} > - > static int peer_abort(struct c4iw_dev *dev, struct sk_buff *skb) > { > struct cpl_abort_req_rss *req = cplhdr(skb); WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c index 74a2250..9387f74 100644 --- a/drivers/infiniband/hw/cxgb4/cm.c +++ b/drivers/infiniband/hw/cxgb4/cm.c @@ -1648,6 +1648,16 @@ static inline int act_open_has_tid(int status) status != CPL_ERR_ARP_MISS; } +/* + * 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; +} + #define ACT_OPEN_RETRY_COUNT 2 static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, @@ -1836,7 +1846,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 (status == CPL_ERR_RTX_NEG_ADVICE) { + if (is_neg_adv(status)) { printk(KERN_WARNING MOD "Connection problems for atid %u\n", atid); return 0; @@ -2266,15 +2276,6 @@ static int peer_close(struct c4iw_dev *dev, struct sk_buff *skb) return 0; } -/* - * Returns whether an ABORT_REQ_RSS message is a negative advice. - */ -static int is_neg_adv_abort(unsigned int status) -{ - return status == CPL_ERR_RTX_NEG_ADVICE || - status == CPL_ERR_PERSIST_NEG_ADVICE; -} - static int peer_abort(struct c4iw_dev *dev, struct sk_buff *skb) { struct cpl_abort_req_rss *req = cplhdr(skb); @@ -2288,7 +2289,7 @@ static int peer_abort(struct c4iw_dev *dev, struct sk_buff *skb) unsigned int tid = GET_TID(req); ep = lookup_tid(t, tid); - if (is_neg_adv_abort(req->status)) { + if (is_neg_adv(req->status)) { PDBG("%s neg_adv_abort ep %p tid %u\n", __func__, ep, ep->hwtid); return 0; @@ -3572,7 +3573,7 @@ static int peer_abort_intr(struct c4iw_dev *dev, struct sk_buff *skb) kfree_skb(skb); return 0; } - if (is_neg_adv_abort(req->status)) { + if (is_neg_adv(req->status)) { PDBG("%s neg_adv_abort ep %p tid %u\n", __func__, ep, ep->hwtid); kfree_skb(skb); diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h index cd6874b..f2738c7 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h @@ -116,6 +116,7 @@ enum CPL_error { CPL_ERR_KEEPALIVE_TIMEDOUT = 34, CPL_ERR_RTX_NEG_ADVICE = 35, CPL_ERR_PERSIST_NEG_ADVICE = 36, + CPL_ERR_KEEPALV_NEG_ADVICE = 37, CPL_ERR_ABORT_FAILED = 42, CPL_ERR_IWARP_FLM = 50, };