Date: Sun, 9 Nov 2008 00:38:11 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r184775 - user/kmacy/HEAD_fast_multi_xmit/sys/net Message-ID: <200811090038.mA90cBKx025988@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Sun Nov 9 00:38:11 2008 New Revision: 184775 URL: http://svn.freebsd.org/changeset/base/184775 Log: Only f_rt needs to be volatile Modified: user/kmacy/HEAD_fast_multi_xmit/sys/net/flowtable.c Modified: user/kmacy/HEAD_fast_multi_xmit/sys/net/flowtable.c ============================================================================== --- user/kmacy/HEAD_fast_multi_xmit/sys/net/flowtable.c Sun Nov 9 00:22:36 2008 (r184774) +++ user/kmacy/HEAD_fast_multi_xmit/sys/net/flowtable.c Sun Nov 9 00:38:11 2008 (r184775) @@ -596,11 +596,11 @@ flowtable_key_equal(struct flentry *fle, } static __inline int -gw_valid(struct flentry *fle) +gw_valid(struct rtentry *rt) { - return ((fle->f_rt->rt_flags & RTF_GATEWAY) == 0 || - ((fle->f_rt->rt_flags & RTF_GATEWAY) && - (fle->f_rt->rt_gwroute->rt_flags & RTF_UP))); + return ((rt->rt_flags & RTF_GATEWAY) == 0 || + ((rt->rt_flags & RTF_GATEWAY) && + (rt->rt_gwroute->rt_flags & RTF_UP))); } @@ -615,7 +615,7 @@ flowtable_lookup(struct flowtable *ft, s struct route ro; int cache = 1, error = 0; u_char desten[ETHER_ADDR_LEN]; - volatile struct rtentry *rt; + struct rtentry *rt; flags = ft ? ft->ft_flags : 0; ro.ro_rt = NULL; @@ -641,17 +641,17 @@ flowtable_lookup(struct flowtable *ft, s } FL_ENTRY_LOCK(ft, hash); fle = FL_ENTRY(ft, hash); - rt = fle->f_rt; + rt = __DEVOLATILE(struct rtentry *, fle->f_rt); if (fle->f_fhash == hash && flowtable_key_equal(fle, key, flags) && (proto == fle->f_proto) && (rt->rt_flags & RTF_UP) && (fle->f_uptime > rt->rt_llinfo_uptime) - && gw_valid(fle)) { + && gw_valid(rt)) { fle->f_uptime = time_uptime; fle->f_flags |= flags; rt->rt_rmx.rmx_pksent++; - ro.ro_rt = __DEVOLATILE(struct rtentry *, rt); + ro.ro_rt = rt; route_to_rtentry_info(&ro, fle->f_desten, ri); FL_ENTRY_UNLOCK(ft, hash); return (0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811090038.mA90cBKx025988>