projects / packages / iproute2.git / blame
| Commit | Line | Data |
|---|---|---|
| 349c0909 AM |
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 | |
| 3 | @@ -162,7 +162,11 @@ | |
| 4 | return -1; | |
| 5 | } | |
| 6 | tcipt_globals.opts = | |
| 7 | - xtables_merge_options(tcipt_globals.opts, | |
| 8 | + xtables_merge_options( | |
| 9 | +#if XTABLES_VERSION_CODE > 5 | |
| 10 | + tcipt_globals.orig_opts, | |
| 11 | +#endif | |
| 12 | + tcipt_globals.opts, | |
| 13 | m->extra_opts, | |
| 14 | &m->option_offset); | |
| 15 | } else { | |
| 16 | @@ -307,7 +311,11 @@ | |
| 17 | } | |
| 18 | ||
| 19 | tcipt_globals.opts = | |
| 20 | - xtables_merge_options(tcipt_globals.opts, | |
| 21 | + xtables_merge_options( | |
| 22 | +#if XTABLES_VERSION_CODE > 5 | |
| 23 | + tcipt_globals.orig_opts, | |
| 24 | +#endif | |
| 25 | + tcipt_globals.opts, | |
| 26 | m->extra_opts, | |
| 27 | &m->option_offset); | |
| 28 | } else { |