---

yaml --- r: 213130 b: refs/heads/master c: 02918be h: refs/heads/master v: v3
git-mirror · Oct 14, 2010 · b1d6b68 · b1d6b68
1 parent d52c8c7
commit b1d6b68
Show file tree

Hide file tree

Showing 3 changed files with 172 additions and 223 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b70a13dac014ec9274640b9e945bde493ba365e
+refs/heads/master: 02918be2273a6b086292e0d85b740336eda46e36
diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h
@@ -626,7 +626,7 @@ DCBP_set_pad_bits(struct p_compressed_bm *p, int n)
 #endif
 
 union p_polymorph {
-        struct p_header80        header;
+        union p_header           header;
         struct p_handshake       handshake;
         struct p_data            data;
         struct p_block_ack       block_ack;
@@ -641,6 +641,8 @@ union p_polymorph {
         struct p_req_state       req_state;
         struct p_req_state_reply req_state_reply;
         struct p_block_req       block_req;
+	struct p_delay_probe93   delay_probe93;
+	struct p_rs_uuid         rs_uuid;
 } __packed;
 
 /**********************************************************************/