From owner-svn-src-all@FreeBSD.ORG Sun Aug 25 09:45:26 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A65AA907; Sun, 25 Aug 2013 09:45:26 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 92EDE2416; Sun, 25 Aug 2013 09:45:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7P9jQDt081509; Sun, 25 Aug 2013 09:45:26 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7P9jQtl081508; Sun, 25 Aug 2013 09:45:26 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201308250945.r7P9jQtl081508@svn.freebsd.org> From: Andre Oppermann Date: Sun, 25 Aug 2013 09:45:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r254832 - head/sys/ofed/drivers/net/mlx4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 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: Sun, 25 Aug 2013 09:45:26 -0000 Author: andre Date: Sun Aug 25 09:45:26 2013 New Revision: 254832 URL: http://svnweb.freebsd.org/changeset/base/254832 Log: Change m->pkthdr.header to m->pkthdr.PH_loc.ptr after r254804 to transiently store pointers to packet headers. Sponsored by: The FreeBSD Foundation Modified: head/sys/ofed/drivers/net/mlx4/en_frag.c Modified: head/sys/ofed/drivers/net/mlx4/en_frag.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/en_frag.c Sun Aug 25 09:41:37 2013 (r254831) +++ head/sys/ofed/drivers/net/mlx4/en_frag.c Sun Aug 25 09:45:26 2013 (r254832) @@ -87,7 +87,7 @@ static void flush_session(struct mlx4_en u16 more) { struct mbuf *mb = session->fragments; - struct ip *iph = mb->m_pkthdr.header; + struct ip *iph = mb->m_pkthdr.PH_loc.ptr; struct net_device *dev = mb->m_pkthdr.rcvif; /* Update IP length and checksum */ @@ -132,7 +132,7 @@ int mlx4_en_rx_frags(struct mlx4_en_priv u16 offset; iph = (struct ip *)(mtod(mb, char *) + ETHER_HDR_LEN); - mb->m_pkthdr.header = iph; + mb->m_pkthdr.PH_loc.ptr = iph; ip_len = ntohs(iph->ip_len); ip_hlen = iph->ip_hl * 4; data_len = ip_len - ip_hlen;