From owner-svn-src-user@FreeBSD.ORG Wed Jun 10 01:26:26 2009 Return-Path: <owner-svn-src-user@FreeBSD.ORG> Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20CA0106564A; Wed, 10 Jun 2009 01:26:26 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0FF718FC29; Wed, 10 Jun 2009 01:26:26 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5A1QPqF089860; Wed, 10 Jun 2009 01:26:25 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5A1QP5o089859; Wed, 10 Jun 2009 01:26:25 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200906100126.n5A1QP5o089859@svn.freebsd.org> From: Kip Macy <kmacy@FreeBSD.org> Date: Wed, 10 Jun 2009 01:26:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193879 - user/kmacy/releng_7_2_fcs/sys/netinet X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" <svn-src-user.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user> List-Post: <mailto:svn-src-user@freebsd.org> List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 10 Jun 2009 01:26:26 -0000 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 */