From 4dd49c0e893f43fb30341c0ce1fbf4f83119bae8 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <mcgrof@frijolero.org>
Date: Mon, 6 Aug 2012 14:14:52 -0700
Subject: [PATCH] Revert "Some distro kernels (in particular the Debian
 3.2.0-3"

This reverts commit 0ab0e31955e0016a4048724f794e8994ed4eec07.
---
 compat/Makefile                                | 6 ++----
 compat/flow_dissector.c                        | 1 +
 compat/{sch_fq_codel_core.c => sch_fq_codel.c} | 0
 include/linux/compat-3.5.h                     | 2 --
 include/net/codel.h                            | 3 +--
 5 files changed, 4 insertions(+), 8 deletions(-)
 rename compat/{sch_fq_codel_core.c => sch_fq_codel.c} (100%)

diff --git a/compat/Makefile b/compat/Makefile
index 23c1296c36e9..c661f5da3768 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -3,9 +3,6 @@ obj-m += compat.o
 
 obj-$(CONFIG_COMPAT_FIRMWARE_CLASS) += compat_firmware_class.o
 obj-$(CONFIG_COMPAT_NET_SCH_CODEL) += sch_codel.o
-
-sch_fq_codel-y = sch_fq_codel_core.o flow_dissector.o
-
 obj-$(CONFIG_COMPAT_NET_SCH_FQ_CODEL) += sch_fq_codel.o
 
 compat-y += main.o
@@ -43,7 +40,8 @@ compat-$(CONFIG_COMPAT_KERNEL_3_0) += compat-3.0.o
 compat-$(CONFIG_COMPAT_KERNEL_3_1) += compat-3.1.o
 compat-$(CONFIG_COMPAT_KERNEL_3_2) += compat-3.2.o
 compat-$(CONFIG_COMPAT_KERNEL_3_3) += \
-	compat-3.3.o
+	compat-3.3.o \
+	flow_dissector.o
 compat-$(CONFIG_COMPAT_KERNEL_3_4) += compat-3.4.o
 
 compat-$(CONFIG_COMPAT_CORDIC) += cordic.o
diff --git a/compat/flow_dissector.c b/compat/flow_dissector.c
index 7dd7ec191506..8affda0b845b 100644
--- a/compat/flow_dissector.c
+++ b/compat/flow_dissector.c
@@ -141,3 +141,4 @@ ipv6:
 
 	return true;
 }
+EXPORT_SYMBOL_GPL(skb_flow_dissect);
diff --git a/compat/sch_fq_codel_core.c b/compat/sch_fq_codel.c
similarity index 100%
rename from compat/sch_fq_codel_core.c
rename to compat/sch_fq_codel.c
diff --git a/include/linux/compat-3.5.h b/include/linux/compat-3.5.h
index 7fadbf2a9c7d..6bb450da208d 100644
--- a/include/linux/compat-3.5.h
+++ b/include/linux/compat-3.5.h
@@ -147,7 +147,6 @@ static inline int compat_vga_switcheroo_register_client(struct pci_dev *dev,
  *   Subject: [PATCH] codel: Controlled Delay AQM
  */
 
-#ifndef TCA_CODEL_MAX
 /* CODEL */
 
 enum {
@@ -235,7 +234,6 @@ struct tc_fq_codel_xstats {
 		struct tc_fq_codel_cl_stats class_stats;
 	};
 };
-#endif /* TCA_CODEL_MAX */
 
 
 /* Backports tty_lock: Localise the lock */
diff --git a/include/net/codel.h b/include/net/codel.h
index ab901c574855..128082ed34dd 100644
--- a/include/net/codel.h
+++ b/include/net/codel.h
@@ -1,7 +1,6 @@
 #include <linux/version.h>
-#include <linux/pkt_sched.h>
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) || defined(TCA_CODEL_MAX)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
 #include_next <net/codel.h>
 #else
 
-- 
2.30.2