[src/trunk]: src/sys/arch/arm/rockchip David Binderman in port-arm/51013: mas...

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

details:   https://anonhg.NetBSD.org/src/rev/e79fcc8f69e9
branches:  trunk
changeset: 344401:e79fcc8f69e9
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Mar 26 17:04:03 2016 +0000

description:
David Binderman in port-arm/51013: masking of rxbdtlen happened before
the value was read - move it down a few lines.

diffstat:

 sys/arch/arm/rockchip/rockchip_emac.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r af981a29f888 -r e79fcc8f69e9 sys/arch/arm/rockchip/rockchip_emac.c
--- a/sys/arch/arm/rockchip/rockchip_emac.c     Sat Mar 26 14:58:13 2016 +0000
+++ b/sys/arch/arm/rockchip/rockchip_emac.c     Sat Mar 26 17:04:03 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_emac.c,v 1.13 2016/02/09 08:32:08 ozaki-r Exp $ */
+/* $NetBSD: rockchip_emac.c,v 1.14 2016/03/26 17:04:03 martin Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "opt_rkemac.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rockchip_emac.c,v 1.13 2016/02/09 08:32:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rockchip_emac.c,v 1.14 2016/03/26 17:04:03 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -521,7 +521,6 @@
        EMAC_WRITE(sc, EMAC_RXRINGPTR_REG, sc->sc_rxq.r_physaddr);
        EMAC_WRITE(sc, EMAC_TXRINGPTR_REG, sc->sc_txq.t_physaddr);
 
-       control &= ~EMAC_CONTROL_RXBDTLEN;
        control = EMAC_READ(sc, EMAC_CONTROL_REG);
        if (ifp->if_flags & IFF_PROMISC) {
                control |= EMAC_CONTROL_PROM;
@@ -534,6 +533,7 @@
                control |= EMAC_CONTROL_DISBC;
        }
 
+       control &= ~EMAC_CONTROL_RXBDTLEN;
        control |= __SHIFTIN(RKEMAC_RX_RING_COUNT, EMAC_CONTROL_RXBDTLEN);
        control &= ~EMAC_CONTROL_TXBDTLEN;
        control |= __SHIFTIN(RKEMAC_TX_RING_COUNT, EMAC_CONTROL_TXBDTLEN);