Module Name: src
Committed By: riz
Date: Thu Nov 5 20:25:30 UTC 2015
Modified Files:
src/sys/arch/mips/atheros/dev [netbsd-7]: athflash.c if_ae.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/arch/mips/atheros/dev/athflash.c
cvs rdiff -u -r1.25 -r1.25.2.1 src/sys/arch/mips/atheros/dev/if_ae.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/atheros/dev/athflash.c
diff -u src/sys/arch/mips/atheros/dev/athflash.c:1.8 src/sys/arch/mips/atheros/dev/athflash.c:1.8.2.1
--- src/sys/arch/mips/atheros/dev/athflash.c:1.8 Fri Jul 25 08:10:34 2014
+++ src/sys/arch/mips/atheros/dev/athflash.c Thu Nov 5 20:25:30 2015
@@ -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 @@ int
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 @@ flashwrite(dev_t dev, struct uio *uio, i
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) {
Index: src/sys/arch/mips/atheros/dev/if_ae.c
diff -u src/sys/arch/mips/atheros/dev/if_ae.c:1.25 src/sys/arch/mips/atheros/dev/if_ae.c:1.25.2.1
--- src/sys/arch/mips/atheros/dev/if_ae.c:1.25 Sun Aug 10 16:44:34 2014
+++ src/sys/arch/mips/atheros/dev/if_ae.c Thu Nov 5 20:25:30 2015
@@ -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 @@ ae_start(struct ifnet *ifp)
{
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 @@ ae_start(struct ifnet *ifp)
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 @@ static void
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 @@ ae_rxintr(struct ae_softc *sc)
#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;
