From owner-svn-src-all@FreeBSD.ORG Wed Feb 22 04:19:33 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E54EF106566B; Wed, 22 Feb 2012 04:19:33 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D09518FC0C; Wed, 22 Feb 2012 04:19:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1M4JXsG034136; Wed, 22 Feb 2012 04:19:33 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1M4JX9Q034134; Wed, 22 Feb 2012 04:19:33 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201202220419.q1M4JX9Q034134@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 22 Feb 2012 04:19:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231991 - head/sys/netinet/ipfw X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Feb 2012 04:19:34 -0000 Author: ae Date: Wed Feb 22 04:19:33 2012 New Revision: 231991 URL: http://svn.freebsd.org/changeset/base/231991 Log: Don't use `m' after m_megapullup. PR: kern/165373 MFC after: 3 days Modified: head/sys/netinet/ipfw/ip_fw_nat.c Modified: head/sys/netinet/ipfw/ip_fw_nat.c ============================================================================== --- head/sys/netinet/ipfw/ip_fw_nat.c Wed Feb 22 03:36:15 2012 (r231990) +++ head/sys/netinet/ipfw/ip_fw_nat.c Wed Feb 22 04:19:33 2012 (r231991) @@ -315,7 +315,7 @@ ipfw_nat(struct ip_fw_args *args, struct } if (retval == PKT_ALIAS_RESPOND) - m->m_flags |= M_SKIP_FIREWALL; + mcl->m_flags |= M_SKIP_FIREWALL; mcl->m_pkthdr.len = mcl->m_len = ntohs(ip->ip_len); /*