1 files changed, 31 insertions, 25 deletions

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 80471269977a..04e299f46455 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -2824,7 +2824,7 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr,
 
         err = ip_route_output_key(&init_net, &rt, &fl);
         if (!err)
-                *dst = &rt->u.dst;
+                *dst = &rt->dst;
         return err;
 #else
         return -ENETUNREACH;
@@ -2996,7 +2996,7 @@ err_out:
 static int cnic_cm_abort(struct cnic_sock *csk)
 {
         struct cnic_local *cp = csk->dev->cnic_priv;
-        u32 opcode;
+        u32 opcode = L4_KCQE_OPCODE_VALUE_RESET_COMP;
 
         if (!cnic_in_use(csk))
                 return -EINVAL;
@@ -3008,12 +3008,9 @@ static int cnic_cm_abort(struct cnic_sock *csk)
          * connect was not successful.
          */
 
-        csk->state = L4_KCQE_OPCODE_VALUE_RESET_COMP;
-        if (test_bit(SK_F_PG_OFFLD_COMPLETE, &csk->flags))
-                opcode = csk->state;
-        else
-                opcode = L5CM_RAMROD_CMD_ID_TERMINATE_OFFLOAD;
         cp->close_conn(csk, opcode);
+        if (csk->state != opcode)
+                return -EALREADY;
 
         return 0;
 }
@@ -3026,6 +3023,8 @@ static int cnic_cm_close(struct cnic_sock *csk)
         if (cnic_close_prep(csk)) {
                 csk->state = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;
                 return cnic_cm_close_req(csk);
+        } else {
+                return -EALREADY;
         }
         return 0;
 }
@@ -3141,12 +3140,6 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe)
                 break;
 
         case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED:
-                if (test_bit(CNIC_F_BNX2_CLASS, &dev->flags)) {
-                        cnic_cm_upcall(cp, csk, opcode);
-                        break;
-                } else if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags))
-                        csk->state = opcode;
-                /* fall through */
         case L4_KCQE_OPCODE_VALUE_CLOSE_COMP:
         case L4_KCQE_OPCODE_VALUE_RESET_COMP:
         case L5CM_RAMROD_CMD_ID_SEARCHER_DELETE:
@@ -3202,19 +3195,22 @@ static int cnic_cm_alloc_mem(struct cnic_dev *dev)
 
 static int cnic_ready_to_close(struct cnic_sock *csk, u32 opcode)
 {
-        if ((opcode == csk->state) ||
-            (opcode == L4_KCQE_OPCODE_VALUE_RESET_RECEIVED &&
-             csk->state == L4_KCQE_OPCODE_VALUE_CLOSE_COMP)) {
-                if (!test_and_set_bit(SK_F_CLOSING, &csk->flags))
-                        return 1;
+        if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags)) {
+                /* Unsolicited RESET_COMP or RESET_RECEIVED */
+                opcode = L4_KCQE_OPCODE_VALUE_RESET_RECEIVED;
+                csk->state = opcode;
         }
-        /* 57710+ only  workaround to handle unsolicited RESET_COMP
-         * which will be treated like a RESET RCVD notification
-         * which triggers the clean up procedure
+
+        /* 1. If event opcode matches the expected event in csk->state
+         * 2. If the expected event is CLOSE_COMP, we accept any event
+         * 3. If the expected event is 0, meaning the connection was never
+         *    never established, we accept the opcode from cm_abort.
          */
-        else if (opcode == L4_KCQE_OPCODE_VALUE_RESET_COMP) {
+        if (opcode == csk->state || csk->state == 0 ||
+            csk->state == L4_KCQE_OPCODE_VALUE_CLOSE_COMP) {
                 if (!test_and_set_bit(SK_F_CLOSING, &csk->flags)) {
-                        csk->state = L4_KCQE_OPCODE_VALUE_RESET_RECEIVED;
+                        if (csk->state == 0)
+                                csk->state = opcode;
                         return 1;
                 }
         }
@@ -3226,8 +3222,14 @@ static void cnic_close_bnx2_conn(struct cnic_sock *csk, u32 opcode)
         struct cnic_dev *dev = csk->dev;
         struct cnic_local *cp = dev->cnic_priv;
 
+        if (opcode == L4_KCQE_OPCODE_VALUE_RESET_RECEIVED) {
+                cnic_cm_upcall(cp, csk, opcode);
+                return;
+        }
+
         clear_bit(SK_F_CONNECT_START, &csk->flags);
         cnic_close_conn(csk);
+        csk->state = opcode;
         cnic_cm_upcall(cp, csk, opcode);
 }
 
@@ -3257,8 +3259,12 @@ static void cnic_close_bnx2x_conn(struct cnic_sock *csk, u32 opcode)
         case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED:
         case L4_KCQE_OPCODE_VALUE_CLOSE_COMP:
         case L4_KCQE_OPCODE_VALUE_RESET_COMP:
-                if (cnic_ready_to_close(csk, opcode))
-                        cmd = L5CM_RAMROD_CMD_ID_SEARCHER_DELETE;
+                if (cnic_ready_to_close(csk, opcode)) {
+                        if (test_bit(SK_F_PG_OFFLD_COMPLETE, &csk->flags))
+                                cmd = L5CM_RAMROD_CMD_ID_SEARCHER_DELETE;
+                        else
+                                close_complete = 1;
+                }
                 break;
         case L5CM_RAMROD_CMD_ID_SEARCHER_DELETE:
                 cmd = L5CM_RAMROD_CMD_ID_TERMINATE_OFFLOAD;