[src/netbsd-7]: src/sys/dev/marvell Pull up following revision(s) (requested ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d5e577f299e
branches:  netbsd-7
changeset: 798825:2d5e577f299e
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jan 12 10:27:10 2015 +0000

description:
Pull up following revision(s) (requested by joerg in ticket #410):
        sys/dev/marvell/if_gfe.c: revision 1.44
sizeof doesn't evaluate the expression, so increment of rxd doesn't
happen. Move it out.

diffstat:

 sys/dev/marvell/if_gfe.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 50898a08e19b -r 2d5e577f299e sys/dev/marvell/if_gfe.c
--- a/sys/dev/marvell/if_gfe.c  Mon Jan 12 10:22:22 2015 +0000
+++ b/sys/dev/marvell/if_gfe.c  Mon Jan 12 10:27:10 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gfe.c,v 1.42.2.1 2014/10/30 12:04:46 martin Exp $   */
+/*     $NetBSD: if_gfe.c,v 1.42.2.2 2015/01/12 10:27:10 martin Exp $   */
 
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.42.2.1 2014/10/30 12:04:46 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.42.2.2 2015/01/12 10:27:10 martin Exp $");
 
 #include "opt_inet.h"
 
@@ -816,7 +816,7 @@
        ds = rxq->rxq_buf_mem.gdm_map->dm_segs;
        nxtaddr = rxq->rxq_desc_busaddr + sizeof(*rxd);
        for (idx = 0, rxd = rxq->rxq_descs; idx < GE_RXDESC_MAX;
-           idx++, nxtaddr += sizeof(*(++rxd))) {
+           idx++, rxd++, nxtaddr += sizeof(*rxd)) {
                rxd->ed_lencnt = htogt32(GE_RXBUF_SIZE << 16);
                rxd->ed_cmdsts = htogt32(RX_CMD_F|RX_CMD_L|RX_CMD_O|RX_CMD_EI);
                rxd->ed_bufptr = htogt32(ds->ds_addr + boff);