PERFORCE change 117694 for review

[Matt Jacob]

http://perforce.freebsd.org/chv.cgi?CH=117694

Change 117694 by mjacob at 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 <sys/cdefs.h>
-__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 <sys/param.h>
 #include <sys/systm.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
@@ -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 <sys/types.h>