X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=inline;f=include%2Flinux%2Fpkt_cls.h;h=c3f01b3085a410ac9334fd993d8ee4cd38ed339e;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=d2aa214d68032fb2d70c51b939257cf762f32e21;hpb=f7f1b0f1e2fbadeab12d24236000e778aa9b1ead;p=linux-2.6.git

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index d2aa214d6..c3f01b308 100644
--- 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 */
@@ -304,6 +305,7 @@ enum
 	TCA_FW_POLICE,
 	TCA_FW_INDEV, /*  used by CONFIG_NET_CLS_IND */
 	TCA_FW_ACT, /* used by CONFIG_NET_CLS_ACT */
+	TCA_FW_MASK,
 	__TCA_FW_MAX
 };
 
@@ -408,6 +410,7 @@ enum
 	TCF_EM_NBYTE,
 	TCF_EM_U32,
 	TCF_EM_META,
+	TCF_EM_TEXT,
 	__TCF_EM_MAX
 };