utils/iproute-2.6.38-fix-01.patch
changeset 631 f7b41f41fd45
parent 622 3aa67e451203
equal deleted inserted replaced
630:c9644cbddd14 631:f7b41f41fd45
       
     1  tc/m_xt.c |   12 ++++++++++--
       
     2  1 files changed, 10 insertions(+), 2 deletions(-)
       
     3 
       
     4 diff --git a/tc/m_xt.c b/tc/m_xt.c
       
     5 index ede9913..268938b 100644
       
     6 --- a/tc/m_xt.c
       
     7 +++ b/tc/m_xt.c
       
     8 @@ -162,7 +162,11 @@ static int parse_ipt(struct action_util *a,int *argc_p,
       
     9  					return -1;
       
    10  				}
       
    11  				tcipt_globals.opts =
       
    12 -				    xtables_merge_options(tcipt_globals.opts,
       
    13 +				    xtables_merge_options(
       
    14 +#if XTABLES_VERSION_CODE > 5
       
    15 +				                          tcipt_globals.orig_opts,
       
    16 +#endif
       
    17 +				                          tcipt_globals.opts,
       
    18  				                          m->extra_opts,
       
    19  				                          &m->option_offset);
       
    20  			} else {
       
    21 @@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg)
       
    22  			}
       
    23  
       
    24  			tcipt_globals.opts =
       
    25 -			    xtables_merge_options(tcipt_globals.opts,
       
    26 +			    xtables_merge_options(
       
    27 +#if XTABLES_VERSION_CODE > 5
       
    28 +			                          tcipt_globals.orig_opts,
       
    29 +#endif
       
    30 +			                          tcipt_globals.opts,
       
    31  			                          m->extra_opts,
       
    32  			                          &m->option_offset);
       
    33  		} else {