From owner-p4-projects@FreeBSD.ORG Sun Apr 8 23:25:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 966D716A405; Sun, 8 Apr 2007 23:25:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5E78816A407 for ; Sun, 8 Apr 2007 23:25:36 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4F5A113C469 for ; Sun, 8 Apr 2007 23:25:36 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l38NPaMT014955 for ; Sun, 8 Apr 2007 23:25:36 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l38NPZin014932 for perforce@freebsd.org; Sun, 8 Apr 2007 23:25:35 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 8 Apr 2007 23:25:35 GMT Message-Id: <200704082325.l38NPZin014932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 117694 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2007 23:25:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=117694 Change 117694 by mjacob@mjexp on 2007/04/08 23:24:34 More IFC. Affected files ... .. //depot/projects/mjexp/sys/dev/ata/ata-dma.c#6 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_lro.c#4 integrate .. //depot/projects/mjexp/sys/sys/param.h#14 integrate Differences ... ==== //depot/projects/mjexp/sys/dev/ata/ata-dma.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.146 2007/04/08 19:18:51 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.147 2007/04/08 21:53:52 sos Exp $"); #include #include @@ -258,8 +258,7 @@ dir ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE); ch->dma->cur_iosize = count; - ch->dma->flags &= ATA_DMA_READ; - ch->dma->flags |= dir ? (ATA_DMA_LOADED | ATA_DMA_READ) : ATA_DMA_LOADED; + ch->dma->flags = dir ? (ATA_DMA_LOADED | ATA_DMA_READ) : ATA_DMA_LOADED; return 0; } ==== //depot/projects/mjexp/sys/dev/cxgb/cxgb_lro.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.3 2007/04/08 18:02:37 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.4 2007/04/08 22:56:18 kmacy Exp $"); #include @@ -66,14 +66,14 @@ #ifdef DEBUG #define MBUF_HEADER_CHECK(m) do { \ - if (m->m_len == 0 || m->m_pkthdr.len == 0 \ - || (m->m_flags & M_PKTHDR) == 0) \ + if ((m->m_len == 0) || (m->m_pkthdr.len == 0) \ + || ((m->m_flags & M_PKTHDR) == 0)) \ panic("lro_flush_session - mbuf len=%d pktlen=%d flags=0x%x\n", \ m->m_len, m->m_pkthdr.len, m->m_flags); \ - if (m->m_flags & M_PKTHDR) == 0) \ + if ((m->m_flags & M_PKTHDR) == 0) \ panic("first mbuf is not packet header - flags=0x%x\n", \ m->m_flags); \ - if (m->m_len < ETHER_HDR_LEN || m->m_pkthdr.len < ETHER_HDR_LEN) \ + if ((m->m_len < ETHER_HDR_LEN) || (m->m_pkthdr.len < ETHER_HDR_LEN)) \ panic("packet too small len=%d pktlen=%d\n", \ m->m_len, m->m_pkthdr.len);\ } while (0) ==== //depot/projects/mjexp/sys/sys/param.h#14 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.290 2007/04/06 02:33:43 pjd Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.291 2007/04/08 22:45:20 delphij Exp $ */ #ifndef _SYS_PARAM_H_ @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 700036 /* Master, propagated to newvers */ +#define __FreeBSD_version 700037 /* Master, propagated to newvers */ #ifndef LOCORE #include