Module Name: src
Committed By: christos
Date: Mon May 12 02:26:19 UTC 2014
Modified Files:
src/sys/dev/pcmcia: if_malo_pcmcia.c if_malo_pcmciavar.h
Log Message:
kill unused array split
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pcmcia/if_malo_pcmcia.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pcmcia/if_malo_pcmciavar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/if_malo_pcmcia.c
diff -u src/sys/dev/pcmcia/if_malo_pcmcia.c:1.6 src/sys/dev/pcmcia/if_malo_pcmcia.c:1.7
--- src/sys/dev/pcmcia/if_malo_pcmcia.c:1.6 Mon Apr 21 18:40:00 2014
+++ src/sys/dev/pcmcia/if_malo_pcmcia.c Sun May 11 22:26:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_malo_pcmcia.c,v 1.6 2014/04/21 22:40:00 pgoyette Exp $ */
+/* $NetBSD: if_malo_pcmcia.c,v 1.7 2014/05/12 02:26:19 christos Exp $ */
/* $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.6 2014/04/21 22:40:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.7 2014/05/12 02:26:19 christos Exp $");
#ifdef _MODULE
#include <sys/module.h>
@@ -1033,7 +1033,7 @@ cmalo_tx(struct malo_softc *sc, struct m
/* prepare TX descriptor */
txdesc->pkgoffset = htole32(sizeof(*txdesc));
txdesc->pkglen = htole16(m->m_pkthdr.len);
- memcpy(txdesc->dstaddrhigh, data, ETHER_ADDR_LEN);
+ memcpy(txdesc->dstaddr, data, ETHER_ADDR_LEN);
/* copy mbuf data to the buffer */
m_copydata(m, 0, m->m_pkthdr.len, sc->sc_data + sizeof(*txdesc));
Index: src/sys/dev/pcmcia/if_malo_pcmciavar.h
diff -u src/sys/dev/pcmcia/if_malo_pcmciavar.h:1.1 src/sys/dev/pcmcia/if_malo_pcmciavar.h:1.2
--- src/sys/dev/pcmcia/if_malo_pcmciavar.h:1.1 Sat Aug 25 04:20:03 2012
+++ src/sys/dev/pcmcia/if_malo_pcmciavar.h Sun May 11 22:26:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_malo_pcmciavar.h,v 1.1 2012/08/25 08:20:03 kiyohara Exp $ */
+/* $NetBSD: if_malo_pcmciavar.h,v 1.2 2014/05/12 02:26:19 christos Exp $ */
/* $OpenBSD: if_malovar.h,v 1.27 2007/10/09 20:37:32 mglocker Exp $ */
/*
@@ -341,8 +341,7 @@ struct malo_tx_desc {
uint32_t control;
uint32_t pkgoffset;
uint16_t pkglen;
- uint8_t dstaddrhigh[2];
- uint8_t dstaddrlow[4];
+ uint8_t dstaddr[ETHER_ADDR_LEN];
uint8_t priority;
uint8_t flags;
uint8_t reserved[2];
