Date: Wed, 10 Jun 2009 01:26:25 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r193879 - user/kmacy/releng_7_2_fcs/sys/netinet Message-ID: <200906100126.n5A1QP5o089859@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Wed Jun 10 01:26:25 2009 New Revision: 193879 URL: http://svn.freebsd.org/changeset/base/193879 Log: per Robert Watson's suggestion on 193698 generalize to check that the packet is greater than mtu before doing the fragmentation drop check that requires an integer divide Modified: user/kmacy/releng_7_2_fcs/sys/netinet/ip_output.c Modified: user/kmacy/releng_7_2_fcs/sys/netinet/ip_output.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/netinet/ip_output.c Wed Jun 10 01:21:32 2009 (r193878) +++ user/kmacy/releng_7_2_fcs/sys/netinet/ip_output.c Wed Jun 10 01:26:25 2009 (r193879) @@ -447,12 +447,12 @@ again: * interface in which case packetdrop should be done by queueing. */ #ifdef ALTQ - if (ifp->if_snd.ifq_len && + if (ip->ip_len > mtu && (!ALTQ_IS_ENABLED(&ifp->if_snd)) && ((ifp->if_snd.ifq_len + ip->ip_len / mtu + 1) >= ifp->if_snd.ifq_maxlen)) #else - if (ifp->if_snd.ifq_len && + if (ip->ip_len > mtu && ((ifp->if_snd.ifq_len + ip->ip_len / mtu + 1) >= ifp->if_snd.ifq_maxlen)) #endif /* ALTQ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906100126.n5A1QP5o089859>