[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20121116081613.75cbb7b0@nehalam.linuxnetplumber.net>
Date: Fri, 16 Nov 2012 08:16:13 -0800
From: Stephen Hemminger <shemminger@...tta.com>
To: Nicolas Dichtel <nicolas.dichtel@...nd.com>
Cc: netdev@...r.kernel.org
Subject: Re: [PATCH iproute2 3/3] ip/ip6tunnel: fix update of tclass and
flowlabel
On Wed, 14 Nov 2012 16:29:26 +0100
Nicolas Dichtel <nicolas.dichtel@...nd.com> wrote:
> When tclass or flowlabel field were updated, we only performed an OR with the
> new value. For example, it was not possible to reset tclass:
> ip -6 tunnel change ip6tnl2 tclass 0
>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@...nd.com>
> ---
> ip/ip6tunnel.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
> index 7aaac61..fcc9f33 100644
> --- a/ip/ip6tunnel.c
> +++ b/ip/ip6tunnel.c
> @@ -173,6 +173,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p)
> matches(*argv, "dsfield") == 0) {
> __u8 uval;
> NEXT_ARG();
> + p->flowinfo &= ~IP6_FLOWINFO_TCLASS;
> if (strcmp(*argv, "inherit") == 0)
> p->flags |= IP6_TNL_F_USE_ORIG_TCLASS;
> else {
> @@ -185,6 +186,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p)
> strcmp(*argv, "fl") == 0) {
> __u32 uval;
> NEXT_ARG();
> + p->flowinfo &= ~IP6_FLOWINFO_FLOWLABEL;
> if (strcmp(*argv, "inherit") == 0)
> p->flags |= IP6_TNL_F_USE_ORIG_FLOWLABEL;
> else {
All applied thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists