Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[~andy/linux] / include / linux / drbd_nl.h

diff --git a/include/linux/drbd_nl.h b/include/linux/drbd_nl.h
index ce77a746fc9d526cad83f5abd96506e221e26fd9..5f042810a56c3b265fe7f4bd0e6fa2acc6e3aa4e 100644 (file)
--- a/include/linux/drbd_nl.h
+++ b/include/linux/drbd_nl.h
@@ -78,10 +78,11 @@ NL_PACKET(syncer_conf, 8,
        NL_INTEGER(     30,     T_MAY_IGNORE,   rate)
        NL_INTEGER(     31,     T_MAY_IGNORE,   after)
        NL_INTEGER(     32,     T_MAY_IGNORE,   al_extents)
-       NL_INTEGER(     71,     T_MAY_IGNORE,   dp_volume)
-       NL_INTEGER(     72,     T_MAY_IGNORE,   dp_interval)
-       NL_INTEGER(     73,     T_MAY_IGNORE,   throttle_th)
-       NL_INTEGER(     74,     T_MAY_IGNORE,   hold_off_th)
+/*     NL_INTEGER(     71,     T_MAY_IGNORE,   dp_volume)
+ *     NL_INTEGER(     72,     T_MAY_IGNORE,   dp_interval)
+ *     NL_INTEGER(     73,     T_MAY_IGNORE,   throttle_th)
+ *     NL_INTEGER(     74,     T_MAY_IGNORE,   hold_off_th)
+ * feature will be reimplemented differently with 8.3.9 */
        NL_STRING(      52,     T_MAY_IGNORE,   verify_alg,     SHARED_SECRET_MAX)
        NL_STRING(      51,     T_MAY_IGNORE,   cpu_mask,       32)
        NL_STRING(      64,     T_MAY_IGNORE,   csums_alg,      SHARED_SECRET_MAX)