svn commit: r190665 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/ed

[Warner Losh]

Author: imp
Date: Fri Apr  3 03:04:26 2009
New Revision: 190665
URL: http://svn.freebsd.org/changeset/base/190665

Log:
  Merge 190488 from head:
  
  Fix shared memory packet movement.
  
  Approved by:	re@ (kostik)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/ed/if_ed.c

Modified: stable/7/sys/dev/ed/if_ed.c
==============================================================================
--- stable/7/sys/dev/ed/if_ed.c	Fri Apr  3 02:28:11 2009	(r190664)
+++ stable/7/sys/dev/ed/if_ed.c	Fri Apr  3 03:04:26 2009	(r190665)
@@ -1307,7 +1307,7 @@ ed_shmem_readmem16(struct ed_softc *sc, 
     uint16_t amount)
 {
 	bus_space_read_region_2(sc->mem_bst, sc->mem_bsh, src, (uint16_t *)dst,
-	    amount + 1 / 2);
+	    (amount + 1) / 2);
 }
 
 /*