Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / w1 / w1_netlink.h

diff --git a/drivers/w1/w1_netlink.h b/drivers/w1/w1_netlink.h
index 01d86a71cf32a0bea559a0cc2f7b67b065a430c1..27e950f935b18040437ae3e64019dde69fc4e273 100644 (file)
--- a/drivers/w1/w1_netlink.h
+++ b/drivers/w1/w1_netlink.h
@@ -40,7 +40,7 @@ enum w1_netlink_message_types {
 struct w1_netlink_msg
 {
        __u8                            type;
-       __u8                            reserved;
+       __u8                            status;
        __u16                           len;
        union {
                __u8                    id[8];
@@ -58,6 +58,7 @@ enum w1_commands {
        W1_CMD_SEARCH,
        W1_CMD_ALARM_SEARCH,
        W1_CMD_TOUCH,
+       W1_CMD_RESET,
        W1_CMD_MAX,
 };