]> www.infradead.org Git - users/sagi/libnvme.git/commitdiff
Merge branch 'mi-mctp-test' of https://github.com/CodeConstruct/libnvme
authorDaniel Wagner <dwagner@suse.de>
Thu, 30 Jun 2022 11:38:10 +0000 (13:38 +0200)
committerDaniel Wagner <dwagner@suse.de>
Thu, 30 Jun 2022 11:38:10 +0000 (13:38 +0200)
Conflicts:
src/nvme/mi-mctp.c

1  2 
src/nvme/mi-mctp.c

index 86257590141ae8fad13cf49b3bd3d46ad4819baa,05fe1b8b7caa3e6395c4844559448a47617e11ea..19c503ebb60fa060d86b4e2c1738d8da1c475a0c
@@@ -84,7 -80,21 +84,16 @@@ struct nvme_mi_transport_mctp 
        int     sd;
  };
  
+ static struct __mi_mctp_socket_ops ops = {
+       socket,
+       sendmsg,
+       recvmsg,
+ };
  
 -
 -#define MCTP_DBUS_PATH "/xyz/openbmc_project/mctp"
 -#define MCTP_DBUS_IFACE "xyz.openbmc_project.MCTP"
 -#define MCTP_DBUS_IFACE_ENDPOINT "xyz.openbmc_project.MCTP.Endpoint"
 -
+ void __nvme_mi_mctp_set_ops(const struct __mi_mctp_socket_ops *newops)
+ {
+       ops = *newops;
+ }
  static const struct nvme_mi_transport nvme_mi_transport_mctp;
  
  static int nvme_mi_mctp_submit(struct nvme_mi_ep *ep,