Print this page
7127  remove -Wno-missing-braces from Makefile.uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/ib/clients/of/sol_ucma/sol_ucma.c
          +++ new/usr/src/uts/common/io/ib/clients/of/sol_ucma/sol_ucma.c
↓ open down ↓ 114 lines elided ↑ open up ↑
 115  115  /* Module Driver Info */
 116  116  static struct modldrv sol_ucma_modldrv = {
 117  117          &mod_driverops,
 118  118          "Solaris User RDMACM driver",
 119  119          &sol_ucma_dev_ops
 120  120  };
 121  121  
 122  122  /* Module Linkage */
 123  123  static struct modlinkage sol_ucma_modlinkage = {
 124  124          MODREV_1,
 125      -        &sol_ucma_modldrv,
 126      -        NULL,
      125 +        { &sol_ucma_modldrv, NULL }
 127  126  };
 128  127  
 129  128  static char     *sol_ucma_dbg_str = "sol_ucma";
 130  129  sol_ofs_uobj_table_t    ucma_file_uo_tbl;
 131  130  sol_ofs_uobj_table_t    ucma_ctx_uo_tbl;
 132  131  sol_ofs_uobj_table_t    ucma_mcast_uo_tbl;
 133  132  
 134  133  /* Function pointers for uverbs functions */
 135  134  static uverbs_get_clnt_hdl_t            uverbs_get_hdl_fp = NULL;
 136  135  static uverbs_qpnum2qphdl_t             uverbs_qpnum2qphdl_fp = NULL;
↓ open down ↓ 494 lines elided ↑ open up ↑
 631  630          return (0);
 632  631  }
 633  632  
 634  633  typedef struct sol_ucma_cmd_table_s {
 635  634          int     (*sol_ucma_cmd_fnc)     (dev_t, void *, struct uio *);
 636  635          uint16_t        sol_ucma_in_len;
 637  636          uint16_t        sol_ucma_out_len;
 638  637  } sol_ucma_cmd_table_t;
 639  638  
 640  639  static  sol_ucma_cmd_table_t    sol_ucma_cmd_table[] = {
 641      -        [RDMA_USER_CM_CMD_CREATE_ID]    = sol_ucma_create_id,
      640 +        [RDMA_USER_CM_CMD_CREATE_ID]    = { sol_ucma_create_id,
 642  641              sizeof (sol_ucma_create_id_t),
 643      -            sizeof (sol_ucma_create_id_resp_t),
 644      -        [RDMA_USER_CM_CMD_DESTROY_ID]   = sol_ucma_destroy_id,
      642 +            sizeof (sol_ucma_create_id_resp_t) },
      643 +        [RDMA_USER_CM_CMD_DESTROY_ID]   = { sol_ucma_destroy_id,
 645  644              sizeof (sol_ucma_destroy_id_t),
 646      -            sizeof (sol_ucma_destroy_id_resp_t),
 647      -        [RDMA_USER_CM_CMD_BIND_ADDR]    = sol_ucma_bind_addr,
      645 +            sizeof (sol_ucma_destroy_id_resp_t) },
      646 +        [RDMA_USER_CM_CMD_BIND_ADDR]    = { sol_ucma_bind_addr,
 648  647              sizeof (sol_ucma_bind_addr_t),
 649      -            0,
 650      -        [RDMA_USER_CM_CMD_RESOLVE_ADDR] = sol_ucma_resolve_addr,
      648 +            0 },
      649 +        [RDMA_USER_CM_CMD_RESOLVE_ADDR] = { sol_ucma_resolve_addr,
 651  650              sizeof (sol_ucma_resolve_addr_t),
 652      -            0,
 653      -        [RDMA_USER_CM_CMD_RESOLVE_ROUTE] = sol_ucma_resolve_route,
      651 +            0 },
      652 +        [RDMA_USER_CM_CMD_RESOLVE_ROUTE] = { sol_ucma_resolve_route,
 654  653              sizeof (sol_ucma_resolve_route_t),
 655      -            0,
 656      -        [RDMA_USER_CM_CMD_QUERY_ROUTE]  = sol_ucma_query_route,
      654 +            0 },
      655 +        [RDMA_USER_CM_CMD_QUERY_ROUTE]  = { sol_ucma_query_route,
 657  656              sizeof (sol_ucma_query_route_t),
 658      -            sizeof (sol_ucma_query_route_resp_t),
 659      -        [RDMA_USER_CM_CMD_CONNECT]      = sol_ucma_connect,
      657 +            sizeof (sol_ucma_query_route_resp_t) },
      658 +        [RDMA_USER_CM_CMD_CONNECT]      = { sol_ucma_connect,
 660  659              sizeof (sol_ucma_connect_t),
 661      -            0,
 662      -        [RDMA_USER_CM_CMD_LISTEN]       = sol_ucma_listen,
      660 +            0 },
      661 +        [RDMA_USER_CM_CMD_LISTEN]       = { sol_ucma_listen,
 663  662              sizeof (sol_ucma_listen_t),
 664      -            0,
 665      -        [RDMA_USER_CM_CMD_ACCEPT]       = sol_ucma_accept,
      663 +            0 },
      664 +        [RDMA_USER_CM_CMD_ACCEPT]       = { sol_ucma_accept,
 666  665              sizeof (sol_ucma_accept_t),
 667      -            0,
 668      -        [RDMA_USER_CM_CMD_REJECT]       = sol_ucma_reject,
      666 +            0 },
      667 +        [RDMA_USER_CM_CMD_REJECT]       = { sol_ucma_reject,
 669  668              sizeof (sol_ucma_reject_t),
 670      -            0,
 671      -        [RDMA_USER_CM_CMD_DISCONNECT]   = sol_ucma_disconnect,
      669 +            0 },
      670 +        [RDMA_USER_CM_CMD_DISCONNECT]   = { sol_ucma_disconnect,
 672  671              sizeof (sol_ucma_disconnect_t),
 673      -            0,
 674      -        [RDMA_USER_CM_CMD_INIT_QP_ATTR] = sol_ucma_init_qp_attr,
      672 +            0 },
      673 +        [RDMA_USER_CM_CMD_INIT_QP_ATTR] = { sol_ucma_init_qp_attr,
 675  674              sizeof (sol_ucma_init_qp_attr_t),
 676      -            sizeof (struct ib_uverbs_qp_attr),
 677      -        [RDMA_USER_CM_CMD_GET_EVENT]    = sol_ucma_get_event,
      675 +            sizeof (struct ib_uverbs_qp_attr) },
      676 +        [RDMA_USER_CM_CMD_GET_EVENT]    = { sol_ucma_get_event,
 678  677              sizeof (sol_ucma_get_event_t),
 679      -            sizeof (sol_ucma_event_resp_t),
 680      -        [RDMA_USER_CM_CMD_GET_OPTION]   = NULL,
      678 +            sizeof (sol_ucma_event_resp_t) },
      679 +        [RDMA_USER_CM_CMD_GET_OPTION]   = { NULL,
 681  680              0,
 682      -            0,
 683      -        [RDMA_USER_CM_CMD_SET_OPTION]   = sol_ucma_set_option,
      681 +            0 },
      682 +        [RDMA_USER_CM_CMD_SET_OPTION]   = { sol_ucma_set_option,
 684  683              sizeof (sol_ucma_set_option_t),
 685      -            0,
 686      -        [RDMA_USER_CM_CMD_NOTIFY]       = sol_ucma_notify,
      684 +            0 },
      685 +        [RDMA_USER_CM_CMD_NOTIFY]       = { sol_ucma_notify,
 687  686              sizeof (sol_ucma_notify_t),
 688      -            0,
 689      -        [RDMA_USER_CM_CMD_JOIN_MCAST]   = sol_ucma_join_mcast,
      687 +            0 },
      688 +        [RDMA_USER_CM_CMD_JOIN_MCAST]   = { sol_ucma_join_mcast,
 690  689              sizeof (sol_ucma_join_mcast_t),
 691      -            sizeof (sol_ucma_create_id_resp_t),
 692      -        [RDMA_USER_CM_CMD_LEAVE_MCAST]  = sol_ucma_leave_mcast,
      690 +            sizeof (sol_ucma_create_id_resp_t) },
      691 +        [RDMA_USER_CM_CMD_LEAVE_MCAST]  = { sol_ucma_leave_mcast,
 693  692              sizeof (sol_ucma_destroy_id_t),
 694      -            sizeof (sol_ucma_destroy_id_resp_t)
      693 +            sizeof (sol_ucma_destroy_id_resp_t) }
 695  694  };
 696  695  
 697  696  #define SOL_UCMA_MAX_CMD_DATA    512
 698  697  static int
 699  698  sol_ucma_write(dev_t dev, struct uio *uio,  cred_t *credp)
 700  699  {
 701  700          sol_ucma_cmd_hdr_t      *user_hdrp;
 702  701          int                     ret;
 703  702          void                    *data_buf = NULL;
 704  703          char                    uio_data[SOL_UCMA_MAX_CMD_DATA];
↓ open down ↓ 1308 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX