1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
index 93ae720e8264..8ca91fdfdc35 100644
--- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
+++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
@@ -849,6 +849,13 @@ static void csk_act_open_retry_timer(unsigned long data)
 
 }
 
+static inline bool is_neg_adv(unsigned int status)
+{
+        return status == CPL_ERR_RTX_NEG_ADVICE ||
+                status == CPL_ERR_KEEPALV_NEG_ADVICE ||
+                status == CPL_ERR_PERSIST_NEG_ADVICE;
+}
+
 static void do_act_open_rpl(struct cxgbi_device *cdev, struct sk_buff *skb)
 {
         struct cxgbi_sock *csk;
@@ -870,7 +877,7 @@ static void do_act_open_rpl(struct cxgbi_device *cdev, struct sk_buff *skb)
                        "csk 0x%p,%u,0x%lx. ", (&csk->saddr), (&csk->daddr),
                        atid, tid, status, csk, csk->state, csk->flags);
 
-        if (status == CPL_ERR_RTX_NEG_ADVICE)
+        if (is_neg_adv(status))
                 goto rel_skb;
 
         module_put(THIS_MODULE);
@@ -976,8 +983,7 @@ static void do_abort_req_rss(struct cxgbi_device *cdev, struct sk_buff *skb)
                        (&csk->saddr), (&csk->daddr),
                        csk, csk->state, csk->flags, csk->tid, req->status);
 
-        if (req->status == CPL_ERR_RTX_NEG_ADVICE ||
-            req->status == CPL_ERR_PERSIST_NEG_ADVICE)
+        if (is_neg_adv(req->status))
                 goto rel_skb;
 
         cxgbi_sock_get(csk);