refresh (create temporary patch)

diff --git a/meta b/meta
index 8480a3084460622f6edb8171042e7063dfaec0a8..e6d12b5f59661aef719f7091b5a8628395214123 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: a3c5b8ecdf0fa75f0426184390390a0678c13175
-Head: da22556e8f2144d92f9d5f544d090d59206d5f5f
+Previous: 47cbe54758ee2d893a86a320a04a6ddef0591fe1
+Head: 40029c65fbf4683f1caf54bb2531f1a9f002868f
 Applied:
   deam: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
   braces: da22556e8f2144d92f9d5f544d090d59206d5f5f
+  refresh-temp: 40029c65fbf4683f1caf54bb2531f1a9f002868f
 Unapplied:
   counters: 2dfd53bab4aa19e9ff81cea1b95a9fcf2eee4f19
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..b8b9e33
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,230 @@
+Bottom: 3f0cd7ed6f329afff1dfddf4cff25880f32dd99e
+Top:    143fb07ac2b47bf2113d0007e4405b579e8a6897
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-06-27 12:11:37 -0700
+
+Refresh of braces
+
+---
+
+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/src/acm.c b/src/acm.c
+index 2afb8f2..8b01adb 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 <stdio.h>
+ #include <errno.h>
+ 
+-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;