From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 3 Dec 2013 07:42:58 +0000 (-0800)
Subject: Update headers to 3.13-rc2
X-Git-Tag: v3.14.0~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a79c7a2dcefc1fc16b27303a88622b5539751cb;p=thirdparty%2Fiproute2.git

Update headers to 3.13-rc2
---

diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index d48123a13..8a1d5006e 100644
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
@@ -28,6 +28,7 @@ struct genlmsghdr {
 #define GENL_ID_GENERATE	0
 #define GENL_ID_CTRL		NLMSG_MIN_TYPE
 #define GENL_ID_VFS_DQUOT	(NLMSG_MIN_TYPE + 1)
+#define GENL_ID_PMCRAID		(NLMSG_MIN_TYPE + 2)
 
 /**************************************************************************
  * Controller
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 93654e7ad..4b727a55a 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -486,7 +486,9 @@ enum {
 	IFLA_HSR_UNSPEC,
 	IFLA_HSR_SLAVE1,
 	IFLA_HSR_SLAVE2,
-	IFLA_HSR_MULTICAST_SPEC,
+	IFLA_HSR_MULTICAST_SPEC,	/* Last byte of supervision addr */
+	IFLA_HSR_SUPERVISION_ADDR,	/* Supervision frame multicast addr */
+	IFLA_HSR_SEQ_NR,
 	__IFLA_HSR_MAX,
 };
 
diff --git a/include/linux/netlink_diag.h b/include/linux/netlink_diag.h
index 4e31db4ee..f2159d30d 100644
--- a/include/linux/netlink_diag.h
+++ b/include/linux/netlink_diag.h
@@ -33,6 +33,7 @@ struct netlink_diag_ring {
 };
 
 enum {
+	/* NETLINK_DIAG_NONE, standard nl API requires this attribute!  */
 	NETLINK_DIAG_MEMINFO,
 	NETLINK_DIAG_GROUPS,
 	NETLINK_DIAG_RX_RING,
diff --git a/include/linux/packet_diag.h b/include/linux/packet_diag.h
index b2cc0cd9c..d08c63f3d 100644
--- a/include/linux/packet_diag.h
+++ b/include/linux/packet_diag.h
@@ -29,6 +29,7 @@ struct packet_diag_msg {
 };
 
 enum {
+	/* PACKET_DIAG_NONE, standard nl API requires this attribute!  */
 	PACKET_DIAG_INFO,
 	PACKET_DIAG_MCLIST,
 	PACKET_DIAG_RX_RING,
diff --git a/include/linux/unix_diag.h b/include/linux/unix_diag.h
index b9e2a6a74..1eb0b8dd1 100644
--- a/include/linux/unix_diag.h
+++ b/include/linux/unix_diag.h
@@ -31,6 +31,7 @@ struct unix_diag_msg {
 };
 
 enum {
+	/* UNIX_DIAG_NONE, standard nl API requires this attribute!  */
 	UNIX_DIAG_NAME,
 	UNIX_DIAG_VFS,
 	UNIX_DIAG_PEER,