1 --- iproute2-2.6.38/tc/m_xt.c.org 2011-05-29 10:01:12.291649868 +0200
2 +++ iproute2-2.6.38/tc/m_xt.c 2011-05-29 10:04:25.340555276 +0200
7 - xtables_merge_options(tcipt_globals.opts,
8 + xtables_merge_options(
9 +#if XTABLES_VERSION_CODE > 5
10 + tcipt_globals.orig_opts,
20 - xtables_merge_options(tcipt_globals.opts,
21 + xtables_merge_options(
22 +#if XTABLES_VERSION_CODE > 5
23 + tcipt_globals.orig_opts,