summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshemminger <shemminger>2005-11-01 17:54:34 +0000
committershemminger <shemminger>2005-11-01 17:54:34 +0000
commit2034ee975057937855cab33768b27977dcd4feae (patch)
tree7b9f80c617c2c38df021ad1d230326bfe49fe1a3
parent234b613556679e22b9b70e9a1e8cb0c9fab991a0 (diff)
Resync headers and do new release.ss-051101
-rw-r--r--ChangeLog4
-rw-r--r--include/SNAPSHOT.h2
-rw-r--r--include/linux/netlink.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e74b2d22..bda8f61a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-01 Stephen Hemminger <shemminger@osdl.org
+
+ * Update to 2.6.14 sanitized headers
+
2005-10-24 Patrick McHardy <kaber@trash.net>
* Fix ip commnad shortcuts
diff --git a/include/SNAPSHOT.h b/include/SNAPSHOT.h
index 6f5baf70..1e9d087e 100644
--- a/include/SNAPSHOT.h
+++ b/include/SNAPSHOT.h
@@ -1 +1 @@
-static char SNAPSHOT[] = "051007";
+static char SNAPSHOT[] = "051101";
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index e433979b..be63c5d6 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -15,10 +15,12 @@
#define NETLINK_ISCSI 8 /* Open-iSCSI */
#define NETLINK_AUDIT 9 /* auditing */
#define NETLINK_FIB_LOOKUP 10
+#define NETLINK_CONNECTOR 11
#define NETLINK_NETFILTER 12 /* netfilter subsystem */
#define NETLINK_IP6_FW 13
#define NETLINK_DNRTMSG 14 /* DECnet routing messages */
#define NETLINK_KOBJECT_UEVENT 15 /* Kernel messages to userspace */
+#define NETLINK_GENERIC 16
#define MAX_LINKS 32