This commit was generated by cvs2svn to compensate for changes in r2587,

[iproute2.git] / include / linux / pkt_cls.h

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 741d15b..bd2c5a2 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -80,6 +80,7 @@ enum
        TCA_ACT_KIND,
        TCA_ACT_OPTIONS,
        TCA_ACT_INDEX,
+       TCA_ACT_STATS,
        __TCA_ACT_MAX
 };
 
@@ -275,6 +276,7 @@ struct tc_rsvp_pinfo
        __u8    protocol;
        __u8    tunnelid;
        __u8    tunnelhdr;
+       __u8    pad;
 };
 
 /* ROUTE filter */
@@ -407,6 +409,7 @@ enum
        TCF_EM_NBYTE,
        TCF_EM_U32,
        TCF_EM_META,
+       TCF_EM_TEXT,
        __TCF_EM_MAX
 };