Resync headers and do new release.

diff --git a/ChangeLog b/ChangeLog
index e74b2d229ec7d7626720c58d1a9475d9156b2d90..bda8f61af2a663d53ce62d1cd9341a4bb7838916 100644 (file)
--- 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 6f5baf703d4658b5e30b4256f3955a6eb8ac4b57..1e9d087eaa2c8a31967f5ef81f0b5723f2395252 100644 (file)
--- 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 e433979bc0273e3271b2c18cb579249673d7b250..be63c5d6112b4e57d68bf24b46f0d6a33880582c 100644 (file)
--- 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