diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-17 12:51:22 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-17 12:51:22 +0100 |
| commit | 9f02979caebb6e900fe101a257d8e6c344a7a173 (patch) | |
| tree | 350b808ae23e8abb4ff08d472b76104a89e1f35a /package/iproute2/patches/patch-tc_m_xt_c | |
| parent | afb9908771db100ee97bb933fcca850c4f49af5a (diff) | |
| parent | ee3c54b1570b9dd8ea900a11d496ced1ad1ae356 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/iproute2/patches/patch-tc_m_xt_c')
| -rw-r--r-- | package/iproute2/patches/patch-tc_m_xt_c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/package/iproute2/patches/patch-tc_m_xt_c b/package/iproute2/patches/patch-tc_m_xt_c new file mode 100644 index 000000000..8399e779a --- /dev/null +++ b/package/iproute2/patches/patch-tc_m_xt_c @@ -0,0 +1,28 @@ +--- iproute2-2.6.38.orig/tc/m_xt.c 2011-03-17 18:05:47.000000000 +0100 ++++ iproute2-2.6.38/tc/m_xt.c 2011-11-09 16:15:44.527071563 +0100 +@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util + return -1; + } + tcipt_globals.opts = +- xtables_merge_options(tcipt_globals.opts, ++ xtables_merge_options( ++#if XTABLES_VERSION_CODE > 5 ++ tcipt_globals.orig_opts, ++#endif ++ tcipt_globals.opts, + m->extra_opts, + &m->option_offset); + } else { +@@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE * + } + + tcipt_globals.opts = +- xtables_merge_options(tcipt_globals.opts, ++ xtables_merge_options( ++#if XTABLES_VERSION_CODE > 5 ++ tcipt_globals.orig_opts, ++#endif ++ tcipt_globals.opts, + m->extra_opts, + &m->option_offset); + } else { |