From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 8 Feb 2008 03:22:42 +0000 (-0800)
Subject: reharmonize headers with pre-freeze 2.6.25
X-Git-Tag: v2.6.25~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7305a84c63c4a311ca1d888a6c986a0d1972efd;p=thirdparty%2Fiproute2.git

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 e3e9e258e..28dfc61cf 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 4ccd684f9..dbb7ac379 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;
 };
 
 /*