Merge branch 'sh/dynamic-irq-cleanup' into sh-latest

[firefly-linux-kernel-4.4.55.git] / include / linux / drbd_nl.h

diff --git a/include/linux/drbd_nl.h b/include/linux/drbd_nl.h
index ab6159e4fcf0c6122cf840aef801fef822b0ab46..a8706f08ab367cfb9b8b9ac79b7f62cb94d0a876 100644 (file)
--- a/include/linux/drbd_nl.h
+++ b/include/linux/drbd_nl.h
@@ -31,9 +31,12 @@ NL_PACKET(disk_conf, 3,
        NL_INTEGER(     56,     T_MAY_IGNORE,   max_bio_bvecs)
        NL_BIT(         57,     T_MAY_IGNORE,   no_disk_barrier)
        NL_BIT(         58,     T_MAY_IGNORE,   no_disk_drain)
+       NL_INTEGER(     89,     T_MAY_IGNORE,   disk_timeout)
 )
 
-NL_PACKET(detach, 4, )
+NL_PACKET(detach, 4,
+       NL_BIT(         88,     T_MANDATORY,    detach_force)
+)
 
 NL_PACKET(net_conf, 5,
        NL_STRING(      8,      T_MANDATORY,    my_addr,        128)