Update to latest kernel headers.

Fix out of range on paretonormal

diff --git a/ChangeLog b/ChangeLog
index 847e5a26ec11be40d52ff6b592be5d3028e532ae..708d92b090404956e77cc9be8e3c5227eed9d2ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-08  Stephen Hemminger  <shemminger@osdl.org>
+
+       * Update to 2.6.13+ kernel headers
+       * Fix array overrun in paretonormal
+       * Fix ematch to not include dropped fields from skb.
+       
 2005-07-14  Thomas Graf <tgraf@suug.ch>
 
        * Make ematch bison/lex build with common flex

diff --git a/include/SNAPSHOT.h b/include/SNAPSHOT.h
index 06c92edccf0e66d28497884cad998b2722f20e82..ff0c4e156b334f153b8ddc71227cfdbd6840b2e8 100644 (file)
--- a/include/SNAPSHOT.h
+++ b/include/SNAPSHOT.h
@@ -1 +1 @@
-static char SNAPSHOT[] = "050607";
+static char SNAPSHOT[] = "050808";

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 13828e565483709600f8eac38b1743a58791465c..90be210c8a11c625676e846a94df458fa547f565 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -5,7 +5,7 @@
 #include <linux/types.h>
 
 #define NETLINK_ROUTE          0       /* Routing/device hook                          */
-#define NETLINK_SKIP           1       /* Reserved for ENskip                          */
+#define NETLINK_W1             1       /* 1-wire subsystem                             */
 #define NETLINK_USERSOCK       2       /* Reserved for user mode socket protocols      */
 #define NETLINK_FIREWALL       3       /* Firewalling hook                             */
 #define NETLINK_TCPDIAG                4       /* TCP socket monitoring                        */
@@ -14,7 +14,9 @@
 #define NETLINK_SELINUX                7       /* SELinux event notifications */
 #define NETLINK_ARPD           8
 #define NETLINK_AUDIT          9       /* auditing */
+#define NETLINK_FIB_LOOKUP     10      
 #define NETLINK_ROUTE6         11      /* af_inet6 route comm channel */
+#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 */

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index d2aa214d68032fb2d70c51b939257cf762f32e21..bd2c5a2bbbf523596130be188879d81238424705 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -276,6 +276,7 @@ struct tc_rsvp_pinfo
        __u8    protocol;
        __u8    tunnelid;
        __u8    tunnelhdr;
+       __u8    pad;
 };
 
 /* ROUTE filter */
@@ -408,6 +409,7 @@ enum
        TCF_EM_NBYTE,
        TCF_EM_U32,
        TCF_EM_META,
+       TCF_EM_TEXT,
        __TCF_EM_MAX
 };
 

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 1d9da36eb9db2f76488f1cdb86acf320809172f1..60ffcb9c5791aef695ce0a48f02f66057ec06c88 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -221,9 +221,11 @@ struct tc_gred_qopt
 /* gred setup */
 struct tc_gred_sopt
 {
-       __u32           DPs;
-       __u32           def_DP;
-       __u8            grio;
+       __u32           DPs;
+       __u32           def_DP;
+       __u8            grio;
+       __u8            pad1;
+       __u16           pad2;
 };
 
 /* HTB section */
@@ -351,6 +353,7 @@ struct tc_cbq_ovl
 #define        TC_CBQ_OVL_DROP         3
 #define        TC_CBQ_OVL_RCLASSIC     4
        unsigned char   priority2;
+       __u16           pad;
        __u32           penalty;
 };
 

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index afc47fdf2459662d4c5d72ae3e3277bd24b74312..25b354983ff65151202b65d444944517d9de93c7 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -363,6 +363,8 @@ enum
 struct rta_session
 {
        __u8    proto;
+       __u8    pad1;
+       __u16   pad2;
 
        union {
                struct {
@@ -635,10 +637,13 @@ struct ifinfomsg
 struct prefixmsg
 {
        unsigned char   prefix_family;
+       unsigned char   prefix_pad1;
+       unsigned short  prefix_pad2;
        int             prefix_ifindex;
        unsigned char   prefix_type;
        unsigned char   prefix_len;
        unsigned char   prefix_flags;
+       unsigned char   prefix_pad3;
 };
 
 enum 

diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
index a6b2cc530af5e1be70ed02d2cf05240c2894c297..081b1ee8516edde81c7583d9248ef760c87b0f3f 100644 (file)
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
@@ -41,19 +41,14 @@ enum
        TCF_META_ID_LOADAVG_1,
        TCF_META_ID_LOADAVG_2,
        TCF_META_ID_DEV,
-       TCF_META_ID_INDEV,
-       TCF_META_ID_REALDEV,
        TCF_META_ID_PRIORITY,
        TCF_META_ID_PROTOCOL,
-       TCF_META_ID_SECURITY,
        TCF_META_ID_PKTTYPE,
        TCF_META_ID_PKTLEN,
        TCF_META_ID_DATALEN,
        TCF_META_ID_MACLEN,
        TCF_META_ID_NFMARK,
        TCF_META_ID_TCINDEX,
-       TCF_META_ID_TCVERDICT,
-       TCF_META_ID_TCCLASSID,
        TCF_META_ID_RTCLASSID,
        TCF_META_ID_RTIIF,
        TCF_META_ID_SK_FAMILY,

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 9703d6be6c4e1343eaa6e2c089886dc02de5db8b..66763799763b8231ef073f6752cdcf63505136b2 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -127,6 +127,7 @@ enum {
 #define TCP_WINDOW_CLAMP       10      /* Bound advertised window */
 #define TCP_INFO               11      /* Information about this connection. */
 #define TCP_QUICKACK           12      /* Block/reenable quick acks */
+#define TCP_CONGESTION         13      /* Congestion control algorithm */
 
 #define TCPI_OPT_TIMESTAMPS    1
 #define TCPI_OPT_SACK          2

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index d68391a9b9f30c5a1aa01e8e2f3f551ff62491cd..f0d423300d84aead0467e222d4d3d3961627abef 100644 (file)
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -196,6 +196,7 @@ struct xfrm_usersa_info {
        __u8                            flags;
 #define XFRM_STATE_NOECN       1
 #define XFRM_STATE_DECAP_DSCP  2
+#define XFRM_STATE_NOPMTUDISC  4
 };
 
 struct xfrm_usersa_id {

diff --git a/netem/paretonormal.c b/netem/paretonormal.c
index 528de78c148b46574fd75b349ab633d86200098d..ed75f288302ba82f180e264cff207799933563c0 100644 (file)
--- a/netem/paretonormal.c
+++ b/netem/paretonormal.c
@@ -51,7 +51,7 @@ main(int argc, char **argv)
 {
        int i,n;
        double x;
-       double table[TABLESIZE];
+       double table[TABLESIZE+1];
 
        for (x = -10.0; x < 10.05; x += .00005) {
                i = rint(TABLESIZE*normal(x, 0.0, 1.0));

diff --git a/tc/em_meta.c b/tc/em_meta.c
index 86186c14366d30a1d0518a041722153971216016..bd1e15128e0e927393e2aa3d7643ab1ecf949392 100644 (file)
--- a/tc/em_meta.c
+++ b/tc/em_meta.c
@@ -62,18 +62,11 @@ struct meta_entry {
        __A(SECTION,            "Interfaces", "", ""),
        __A(DEV,                "dev",          "iv",
                                "Device the packet is on"),
-       __A(INDEV,              "indev",        "iv",
-                               "Device the packet came in"),
-       __A(REALDEV,            "realdev",      "iv",
-                               "Underlying real device"),
-
        __A(SECTION,            "Packet attributes", "", ""),
        __A(PRIORITY,           "priority",     "i",
                                "Priority of packet"),
        __A(PROTOCOL,           "protocol",     "i",
                                "Link layer protocol"),
-       __A(SECURITY,           "security",     "i",
-                               "Security level"),
        __A(PKTTYPE,            "pkt_type",     "i",
                                "Packet type (uni|multi|broad|...)cast"),
        __A(PKTLEN,             "pkt_len",      "i",
@@ -91,9 +84,6 @@ struct meta_entry {
 
        __A(SECTION,            "Traffic Control", "", ""),
        __A(TCINDEX,            "tc_index",     "i",    "TC Index"),
-       __A(TCVERDICT,          "tc_verdict",   "i",    "TC Verdict"),
-       __A(TCCLASSID,          "tc_classid",   "i",    "TC ClassID"),
-
        __A(SECTION,            "Routing", "", ""),
        __A(RTCLASSID,          "rt_classid",   "i",
                                "Routing ClassID (cls_route)"),