[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <AE90C24D6B3A694183C094C60CF0A2F6026B7157@saturn3.aculab.com>
Date: Wed, 20 Feb 2013 10:55:35 -0000
From: "David Laight" <David.Laight@...LAB.COM>
To: "Neil Horman" <nhorman@...driver.com>, <netdev@...r.kernel.org>
Cc: <eric.dumazet@...il.com>, "David Miller" <davem@...emloft.net>,
"Gao feng" <gaofeng@...fujitsu.com>, "Jiri Bohac" <jbohac@...e.cz>
Subject: RE: [RFC PATCH] ipv6: Split from and expires field in dst_entry out of union [net-next]
> static inline void rt6_clean_expires(struct rt6_info *rt)
> {
> - if (!(rt->rt6i_flags & RTF_EXPIRES) && rt->dst.from)
> + if (!rt->rt6i_flags & RTF_EXPIRES)
> dst_release(rt->dst.from);
>
> rt->rt6i_flags &= ~RTF_EXPIRES;
> rt->dst.from = NULL;
> + rt->dst.expires = 0;
> }
>
> static inline void rt6_set_expires(struct rt6_info *rt, unsigned long expires)
> {
> - if (!(rt->rt6i_flags & RTF_EXPIRES) && rt->dst.from)
> + if (!rt->rt6i_flags & RTF_EXPIRES)
> dst_release(rt->dst.from);
>
> rt->rt6i_flags |= RTF_EXPIRES;
> + rt->dst.from = NULL;
> rt->dst.expires = expires;
> }
>
> static inline void rt6_update_expires(struct rt6_info *rt, int timeout)
> {
> if (!(rt->rt6i_flags & RTF_EXPIRES)) {
> - if (rt->dst.from)
> - dst_release(rt->dst.from);
> + dst_release(rt->dst.from);
> /* dst_set_expires relies on expires == 0
> * if it has not been set previously.
> */
> rt->dst.expires = 0;
> + rt6->dst.from = NULL;
> }
Aren't there also problems with setting and clearing RTF_EXPIRES?
Since that flag looks as though it was the descriminant for the union
it probably isn't needed - provided dst.expires is never 0 when valid.
David
--
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