From owner-svn-src-all@FreeBSD.ORG  Sun Apr 22 17:00:53 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 4B288106566C;
	Sun, 22 Apr 2012 17:00:53 +0000 (UTC)
	(envelope-from melifaro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3638B8FC0A;
	Sun, 22 Apr 2012 17:00:53 +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 q3MH0r17048667;
	Sun, 22 Apr 2012 17:00:53 GMT
	(envelope-from melifaro@svn.freebsd.org)
Received: (from melifaro@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3MH0rDt048665;
	Sun, 22 Apr 2012 17:00:53 GMT
	(envelope-from melifaro@svn.freebsd.org)
Message-Id: <201204221700.q3MH0rDt048665@svn.freebsd.org>
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sun, 22 Apr 2012 17:00:53 +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: r234574 - head/sys/netgraph
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Apr 2012 17:00:53 -0000

Author: melifaro
Date: Sun Apr 22 17:00:52 2012
New Revision: 234574
URL: http://svn.freebsd.org/changeset/base/234574

Log:
  Fix panic in ng_patch(4) caused by checksum flags being added to mbuf flags.
  
  Tested by:        Maxim Ignatenko <gelraen.ua@gmail.com>
  Approved by:      kib(mentor)
  
  MFC after:        3 days

Modified:
  head/sys/netgraph/ng_patch.c

Modified: head/sys/netgraph/ng_patch.c
==============================================================================
--- head/sys/netgraph/ng_patch.c	Sun Apr 22 16:58:14 2012	(r234573)
+++ head/sys/netgraph/ng_patch.c	Sun Apr 22 17:00:52 2012	(r234574)
@@ -517,7 +517,7 @@ ng_patch_rcvdata(hook_p hook, item_p ite
 			return (ENOMEM);
 		}
 		do_patch(priv, m);
-		m->m_flags |= priv->config->csum_flags;
+		m->m_pkthdr.csum_flags |= priv->config->csum_flags;
 	}
 
 	target = NULL;