On Mon, Aug 6, 2012 at 1:33 PM, Hauke Mehrtens <hauke@xxxxxxxxxx> wrote: > On 08/06/2012 09:53 PM, Luis R. Rodriguez wrote: >> On Sun, Aug 5, 2012 at 3:29 AM, Johannes Berg <johannes@xxxxxxxxxxxxxxxx> wrote: >>> From: Johannes Berg <johannes.berg@xxxxxxxxx> >>> >>> Some distro kernels (in particular the Debian 3.2.0-3 >>> kernel I'm running) backport codel already, so trying >>> to backport it again causes issues. Protect the compat >>> backport with #ifdef TCA_CODEL_MAX. >>> >>> Also link the flow_dissector code into the codel module >>> which then won't be loaded on kernels that already have >>> codel backported. >>> >>> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> >> >> Applied and pushed, thanks! >> >> Luis >> > This breaks my build if net/codel.h is not in the kernel headers: > > In file included from > /home/hauke/compat-wireless/compat-wireless/compat/sch_fq_codel_core.c:27:0: > /home/hauke/compat-wireless/compat-wireless/include/net/codel.h:5:28: > fatal error: net/codel.h: No such file or directory > compilation terminated. > > TCA_CODEL_MAX is defined in include/linux/compat-3.5.h and this file is > included ever time, so the check around #include_next <net/codel.h> is > never false. > > You could define something like COMPAT_CODEL_BACKPORT in > include/linux/compat-3.5.h and extend the check in include/net/codel.h > that this has to be unset. Dah, reverting for now, I need to get some compiles through. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
