From b01c54e6f101bc4e46cc1c08b6d5f0d21b67fb93 Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 12 May 2014 02:26:19 +0000 Subject: [PATCH] kill unused array split --- sys/dev/pcmcia/if_malo_pcmcia.c | 6 +++--- sys/dev/pcmcia/if_malo_pcmciavar.h | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/dev/pcmcia/if_malo_pcmcia.c b/sys/dev/pcmcia/if_malo_pcmcia.c index 288525be5863..f9fb4175a81b 100644 --- a/sys/dev/pcmcia/if_malo_pcmcia.c +++ b/sys/dev/pcmcia/if_malo_pcmcia.c @@ -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 -__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 @@ -1033,7 +1033,7 @@ cmalo_tx(struct malo_softc *sc, struct mbuf *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)); diff --git a/sys/dev/pcmcia/if_malo_pcmciavar.h b/sys/dev/pcmcia/if_malo_pcmciavar.h index 470b2b1a27c3..92b49d9b9473 100644 --- a/sys/dev/pcmcia/if_malo_pcmciavar.h +++ b/sys/dev/pcmcia/if_malo_pcmciavar.h @@ -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];