[src/netbsd-7]: src/sys/arch/mips/atheros/dev Pull up revisions (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/41520fc1ac5b
branches:  netbsd-7
changeset: 799642:41520fc1ac5b
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Nov 05 20:25:30 2015 +0000

description:
Pull up revisions (requested by nisimura in ticket #978):
sys/arch/mips/atheros/dev/athflash.c: 1.9
sys/arch/mips/atheros/dev/if_ae.c: 1.25

remove unused variables which break AP30 and MERAKI kernel builds.

diffstat:

 sys/arch/mips/atheros/dev/athflash.c |   9 ++-------
 sys/arch/mips/atheros/dev/if_ae.c    |  10 +++-------
 2 files changed, 5 insertions(+), 14 deletions(-)

diffs (89 lines):

diff -r 4545dad8ec33 -r 41520fc1ac5b sys/arch/mips/atheros/dev/athflash.c
--- a/sys/arch/mips/atheros/dev/athflash.c      Thu Nov 05 09:34:23 2015 +0000
+++ b/sys/arch/mips/atheros/dev/athflash.c      Thu Nov 05 20:25:30 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: athflash.c,v 1.8 2014/07/25 08:10:34 dholland Exp $ */
+/* $NetBSD: athflash.c,v 1.8.2.1 2015/11/05 20:25:30 riz Exp $ */
 
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: athflash.c,v 1.8 2014/07/25 08:10:34 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athflash.c,v 1.8.2.1 2015/11/05 20:25:30 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -318,8 +318,6 @@
 flashwrite(dev_t dev, struct uio *uio, int flag)
 {
        struct flash_softc      *sc;
-       bus_space_tag_t         iot;
-       bus_space_handle_t      ioh;
        bus_size_t              off;
        int                     stat;
        int                     error;
@@ -333,9 +331,6 @@
        if (uio->uio_resid % sc->sc_sector_size)
                return EINVAL;
 
-       iot = sc->sc_iot;
-       ioh = sc->sc_ioh;
-       
        for (off = uio->uio_offset;
             uio->uio_resid > 0;
             off += sc->sc_sector_size) {
diff -r 4545dad8ec33 -r 41520fc1ac5b sys/arch/mips/atheros/dev/if_ae.c
--- a/sys/arch/mips/atheros/dev/if_ae.c Thu Nov 05 09:34:23 2015 +0000
+++ b/sys/arch/mips/atheros/dev/if_ae.c Thu Nov 05 20:25:30 2015 +0000
@@ -1,4 +1,4 @@
-/* $Id: if_ae.c,v 1.25 2014/08/10 16:44:34 tls Exp $ */
+/* $Id: if_ae.c,v 1.25.2.1 2015/11/05 20:25:30 riz Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.25 2014/08/10 16:44:34 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.25.2.1 2015/11/05 20:25:30 riz Exp $");
 
 
 #include <sys/param.h>
@@ -547,7 +547,7 @@
 {
        struct ae_softc *sc = ifp->if_softc;
        struct mbuf *m0, *m;
-       struct ae_txsoft *txs, *last_txs = NULL;
+       struct ae_txsoft *txs;
        bus_dmamap_t dmamap;
        int error, firsttx, nexttx, lasttx = 1, ofree, seg;
 
@@ -728,8 +728,6 @@
                SIMPLEQ_REMOVE_HEAD(&sc->sc_txfreeq, txs_q);
                SIMPLEQ_INSERT_TAIL(&sc->sc_txdirtyq, txs, txs_q);
 
-               last_txs = txs;
-
                /*
                 * Pass the packet to any BPF listeners.
                 */
@@ -1011,7 +1009,6 @@
 ae_rxintr(struct ae_softc *sc)
 {
        struct ifnet *ifp = &sc->sc_ethercom.ec_if;
-       struct ether_header *eh;
        struct ae_rxsoft *rxs;
        struct mbuf *m;
        u_int32_t rxstat;
@@ -1132,7 +1129,6 @@
 #endif /* __NO_STRICT_ALIGNMENT */
 
                ifp->if_ipackets++;
-               eh = mtod(m, struct ether_header *);
                m->m_pkthdr.rcvif = ifp;
                m->m_pkthdr.len = m->m_len = len;