From e7305a84c63c4a311ca1d888a6c986a0d1972efd Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Thu, 7 Feb 2008 19:22:42 -0800
Subject: [PATCH] reharmonize headers with pre-freeze 2.6.25

Some minor header file changes headed for 2.6.25
---
 include/linux/pkt_cls.h   | 2 +-
 include/linux/pkt_sched.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index e3e9e258..28dfc61c 100644
--- 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 4ccd684f..dbb7ac37 100644
--- 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;
 };
 
 /*