From 85490e3723793a35ca0902549132423293f14d01 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 30 Jun 2011 11:27:36 -0700 Subject: [PATCH] commit --- meta | 3 +- patches/fixup-starting-curly-brace-ali | 247 ------------------------- 2 files changed, 1 insertion(+), 249 deletions(-) delete mode 100644 patches/fixup-starting-curly-brace-ali diff --git a/meta b/meta index a8113e5..86a6fbd 100644 --- a/meta +++ b/meta @@ -1,8 +1,7 @@ Version: 1 -Previous: 1580cab0825d58194a27538da313e42506af5fa8 +Previous: 111e3626b5a9fe3d565a298cc497e96f49d34d83 Head: 492a75211ea7e4cf60115164f45503b5b02d7798 Applied: - fixup-starting-curly-brace-ali: 492a75211ea7e4cf60115164f45503b5b02d7798 Unapplied: counters: b491f82e1c52dd1da5e568782b5fed4e58f1f19e alias: 66b03436cb915b08240eb12ee1ec8779067cc5f8 diff --git a/patches/fixup-starting-curly-brace-ali b/patches/fixup-starting-curly-brace-ali deleted file mode 100644 index d095439..0000000 --- a/patches/fixup-starting-curly-brace-ali +++ /dev/null @@ -1,247 +0,0 @@ -Bottom: 291e865141371dd166944d40cde7ecb21151f2e0 -Top: 13708d93033737fb4a684536e5e46ea1e920e387 -Author: Sean Hefty -Date: 2011-06-27 12:08:16 -0700 - -Fixup starting curly brace alignment - -Signed-off-by: Sean Hefty - - ---- - -diff --git a/include/infiniband/acm.h b/include/infiniband/acm.h -index 41b95b8..143d512 100644 ---- a/include/infiniband/acm.h -+++ b/include/infiniband/acm.h -@@ -62,8 +62,7 @@ - */ - #define ACM_MSG_DATA_LENGTH (ACM_MSG_EP_LENGTH * 8) - --struct acm_hdr --{ -+struct acm_hdr { - uint8_t version; - uint8_t opcode; - uint8_t status; -@@ -77,8 +76,7 @@ struct acm_hdr - #define ACM_EP_INFO_ADDRESS_IP6 0x0003 - #define ACM_EP_INFO_PATH 0x0010 - --union acm_ep_info --{ -+union acm_ep_info { - uint8_t addr[ACM_MAX_ADDRESS]; - uint8_t name[ACM_MAX_ADDRESS]; - struct ibv_path_record path; -@@ -87,22 +85,19 @@ union acm_ep_info - #define ACM_EP_FLAG_SOURCE (1<<0) - #define ACM_EP_FLAG_DEST (1<<1) - --struct acm_ep_addr_data --{ -+struct acm_ep_addr_data { - uint32_t flags; - uint16_t type; - uint16_t reserved; - union acm_ep_info info; - }; - --struct acm_resolve_msg --{ -+struct acm_resolve_msg { - struct acm_hdr hdr; - struct acm_ep_addr_data data[0]; - }; - --struct acm_msg --{ -+struct acm_msg { - struct acm_hdr hdr; - uint8_t data[ACM_MSG_DATA_LENGTH]; - }; -diff --git a/linux/dlist.h b/linux/dlist.h -index dc4934d..d08f843 100644 ---- a/linux/dlist.h -+++ b/linux/dlist.h -@@ -34,8 +34,7 @@ - extern "C" { - #endif - --typedef struct _DLIST_ENTRY --{ -+typedef struct _DLIST_ENTRY { - struct _DLIST_ENTRY *Next; - struct _DLIST_ENTRY *Prev; - -diff --git a/src/acm.c b/src/acm.c -index 210fd30..7b0639a 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -60,19 +60,16 @@ enum acm_state { - ACM_READY - }; - --enum acm_addr_prot --{ -+enum acm_addr_prot { - ACM_ADDR_PROT_ACM - }; - --enum acm_route_prot --{ -+enum acm_route_prot { - ACM_ROUTE_PROT_ACM, - ACM_ROUTE_PROT_SA - }; - --enum acm_loopback_prot --{ -+enum acm_loopback_prot { - ACM_LOOPBACK_PROT_NONE, - ACM_LOOPBACK_PROT_LOCAL - }; -@@ -80,8 +77,7 @@ enum acm_loopback_prot - /* - * Nested locking order: dest -> ep, dest -> port - */ --struct acm_dest --{ -+struct acm_dest { - uint8_t address[ACM_MAX_ADDRESS]; /* keep first */ - char name[ACM_MAX_ADDRESS]; - struct ibv_ah *ah; -@@ -97,8 +93,7 @@ struct acm_dest - uint8_t addr_type; - }; - --struct acm_port --{ -+struct acm_port { - struct acm_device *dev; - DLIST_ENTRY ep_list; - lock_t lock; -@@ -116,8 +111,7 @@ struct acm_port - uint8_t port_num; - }; - --struct acm_device --{ -+struct acm_device { - struct ibv_context *verbs; - struct ibv_comp_channel *channel; - struct ibv_pd *pd; -@@ -128,14 +122,12 @@ struct acm_device - }; - - /* Maintain separate virtual send queues to avoid deadlock */ --struct acm_send_queue --{ -+struct acm_send_queue { - int credits; - DLIST_ENTRY pending; - }; - --struct acm_ep --{ -+struct acm_ep { - struct acm_port *port; - struct ibv_cq *cq; - struct ibv_qp *qp; -@@ -159,8 +151,7 @@ struct acm_ep - enum acm_state state; - }; - --struct acm_send_msg --{ -+struct acm_send_msg { - DLIST_ENTRY entry; - struct acm_ep *ep; - struct acm_dest *dest; -@@ -177,16 +168,14 @@ struct acm_send_msg - uint8_t data[ACM_SEND_SIZE]; - }; - --struct acm_client --{ -+struct acm_client { - lock_t lock; /* acquire ep lock first */ - SOCKET sock; - int index; - atomic_t refcnt; - }; - --struct acm_request --{ -+struct acm_request { - struct acm_client *client; - DLIST_ENTRY entry; - struct acm_msg msg; -diff --git a/src/acm_mad.h b/src/acm_mad.h -index 2e3519d..68e231b 100644 ---- a/src/acm_mad.h -+++ b/src/acm_mad.h -@@ -49,8 +49,7 @@ - #define ACM_CTRL_ACK htons(0x8000) - #define ACM_CTRL_RESOLVE htons(0x0001) - --struct acm_mad --{ -+struct acm_mad { - uint8_t base_version; - uint8_t mgmt_class; - uint8_t class_version; -@@ -77,8 +76,7 @@ struct acm_mad - - #define ACM_MAX_GID_COUNT 10 - --struct acm_resolve_rec --{ -+struct acm_resolve_rec { - uint8_t dest_type; - uint8_t dest_length; - uint8_t src_type; -@@ -94,8 +92,7 @@ struct acm_resolve_rec - - #define IB_MGMT_CLASS_SA 0x03 - --struct ib_sa_mad --{ -+struct ib_sa_mad { - uint8_t base_version; - uint8_t mgmt_class; - uint8_t class_version; -@@ -171,8 +168,7 @@ struct ib_sa_mad - #define IB_COMP_MASK_MC_JOIN_STATE htonll(1 << 16) - #define IB_COMP_MASK_MC_PROXY_JOIN htonll(1 << 17) - --struct ib_mc_member_rec --{ -+struct ib_mc_member_rec { - union ibv_gid mgid; - union ibv_gid port_gid; - uint32_t qkey; -diff --git a/src/libacm.c b/src/libacm.c -index c59a8fb..31014d1 100644 ---- a/src/libacm.c -+++ b/src/libacm.c -@@ -37,8 +37,7 @@ - #include - #include - --struct acm_port --{ -+struct acm_port { - uint8_t port_num; - uint16_t lid; - union ibv_gid gid; -@@ -46,8 +45,7 @@ struct acm_port - uint16_t pkey[4]; - }; - --struct acm_device --{ -+struct acm_device { - struct ibv_context *verbs; - uint64_t guid; - int port_cnt; -- 2.41.0