Merge tag 'platform-drivers-x86-v4.12-2' of git://git.infradead.org/linux-platform...

[karo-tx-linux.git] / drivers / infiniband / hw / nes / nes_cm.c

diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 8e703479e7ce65044633953803c8114789ac3bc0..30b256a2c54ec42dd97b29ff0f0cb15be6d44510 100644 (file)
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -135,17 +135,17 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
 /* instance of function pointers for client API */
 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
 static const struct nes_cm_ops nes_cm_api = {
-       mini_cm_accelerated,
-       mini_cm_listen,
-       mini_cm_del_listen,
-       mini_cm_connect,
-       mini_cm_close,
-       mini_cm_accept,
-       mini_cm_reject,
-       mini_cm_recv_pkt,
-       mini_cm_dealloc_core,
-       mini_cm_get,
-       mini_cm_set
+       .accelerated = mini_cm_accelerated,
+       .listen = mini_cm_listen,
+       .stop_listener = mini_cm_del_listen,
+       .connect = mini_cm_connect,
+       .close = mini_cm_close,
+       .accept = mini_cm_accept,
+       .reject = mini_cm_reject,
+       .recv_pkt = mini_cm_recv_pkt,
+       .destroy_cm_core = mini_cm_dealloc_core,
+       .get = mini_cm_get,
+       .set = mini_cm_set
 };
 
 static struct nes_cm_core *g_cm_core;
@@ -610,7 +610,6 @@ static void build_mpa_v2(struct nes_cm_node *cm_node,
                ctrl_ord = cm_node->ord_size & IETF_NO_IRD_ORD;
        }
        ctrl_ird |= IETF_PEER_TO_PEER;
-       ctrl_ird |= IETF_FLPDU_ZERO_LEN;
 
        switch (mpa_key) {
        case MPA_KEY_REQUEST:
@@ -1826,7 +1825,7 @@ static void handle_rcv_mpa(struct nes_cm_node *cm_node, struct sk_buff *skb)
                        type = NES_CM_EVENT_CONNECTED;
                        cm_node->state = NES_CM_STATE_TSA;
                }
-
+               send_ack(cm_node, NULL);
                break;
        default:
                WARN_ON(1);