Date: Tue, 30 Dec 2008 00:50:25 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r186580 - user/kmacy/HEAD_fast_net/sys/netinet Message-ID: <200812300050.mBU0oPKM071402@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Tue Dec 30 00:50:25 2008 New Revision: 186580 URL: http://svn.freebsd.org/changeset/base/186580 Log: don't check INP_WLOCKED if inp is NULL Modified: user/kmacy/HEAD_fast_net/sys/netinet/ip_output.c Modified: user/kmacy/HEAD_fast_net/sys/netinet/ip_output.c ============================================================================== --- user/kmacy/HEAD_fast_net/sys/netinet/ip_output.c Tue Dec 30 00:19:06 2008 (r186579) +++ user/kmacy/HEAD_fast_net/sys/netinet/ip_output.c Tue Dec 30 00:50:25 2008 (r186580) @@ -631,14 +631,15 @@ passout: done: if (ro == &iproute && ro->ro_rt != NULL) { - int wlocked; + int wlocked = 0; struct llentry *la; - wlocked = INP_WLOCKED(inp); - if ((neednewlle || neednewroute) && - !wlocked && INP_TRY_UPGRADE(inp) == 0) - return (error); - + if (neednewlle || neednewroute) { + wlocked = INP_WLOCKED(inp); + if (!wlocked && INP_TRY_UPGRADE(inp) == 0) + return (error); + } + if (inp == NULL || (inp->inp_vflag & INP_RT_VALID) == 0) RTFREE(ro->ro_rt); else if (neednewroute && ro->ro_rt != inp->inp_rt) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812300050.mBU0oPKM071402>