import 15.2.5

[ceph.git] / ceph / src / include / msgr.h

diff --git a/ceph/src/include/msgr.h b/ceph/src/include/msgr.h
index bda8108082475f8a13b67920cc41658acc204060..f7b2a07816ba4843bc9e692f860782bc41d25981 100644 (file)
--- a/ceph/src/include/msgr.h
+++ b/ceph/src/include/msgr.h
@@ -52,15 +52,16 @@
 #define DEFINE_MSGR2_FEATURE(bit, incarnation, name)               \
        const static uint64_t CEPH_MSGR2_FEATURE_##name = (1ULL << bit); \
        const static uint64_t CEPH_MSGR2_FEATUREMASK_##name =            \
-                       (1ULL << bit | CEPH_FEATURE_INCARNATION_##incarnation);
+                       (1ULL << bit | CEPH_MSGR2_INCARNATION_##incarnation);
 
 #define HAVE_MSGR2_FEATURE(x, name) \
        (((x) & (CEPH_MSGR2_FEATUREMASK_##name)) == (CEPH_MSGR2_FEATUREMASK_##name))
 
+DEFINE_MSGR2_FEATURE( 0, 1, REVISION_1)   // msgr2.1
 
-#define CEPH_MSGR2_SUPPORTED_FEATURES (0ull)
+#define CEPH_MSGR2_SUPPORTED_FEATURES (CEPH_MSGR2_FEATURE_REVISION_1)
 
-#define CEPH_MSGR2_REQUIRED_FEATURES (CEPH_MSGR2_SUPPORTED_FEATURES)
+#define CEPH_MSGR2_REQUIRED_FEATURES  (0ull)
 
 
 /*