reharmonize headers with pre-freeze 2.6.25

Some minor header file changes headed for 2.6.25

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index e3e9e258ee961b237549b0d6d7a4501084d73405..28dfc61cf79e590d18c6ba62cbb8ee66b8101d89 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -460,7 +460,7 @@ enum
 #define        TCF_EM_U32              3
 #define        TCF_EM_META             4
 #define        TCF_EM_TEXT             5
-#define TCF_EM_VLAN            6
+#define        TCF_EM_VLAN             6
 #define        TCF_EM_MAX              6
 
 enum

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 4ccd684f93812e1161537ea68290cb02e47675dd..dbb7ac37960d2a092d4250235aa3a37e5a97e61c 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -152,7 +152,7 @@ struct tc_sfq_qopt
 
 struct tc_sfq_xstats
 {
-       __u32           allot;
+       __s32           allot;
 };
 
 /*