Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pcmcia kill unused array split



details:   https://anonhg.NetBSD.org/src/rev/a41f8ee6c666
branches:  trunk
changeset: 329149:a41f8ee6c666
user:      christos <christos%NetBSD.org@localhost>
date:      Mon May 12 02:26:19 2014 +0000

description:
kill unused array split

diffstat:

 sys/dev/pcmcia/if_malo_pcmcia.c    |  6 +++---
 sys/dev/pcmcia/if_malo_pcmciavar.h |  5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 772967d58dc4 -r a41f8ee6c666 sys/dev/pcmcia/if_malo_pcmcia.c
--- a/sys/dev/pcmcia/if_malo_pcmcia.c   Sun May 11 09:01:42 2014 +0000
+++ b/sys/dev/pcmcia/if_malo_pcmcia.c   Mon May 12 02:26:19 2014 +0000
@@ -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 @@
        /* 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 -r 772967d58dc4 -r a41f8ee6c666 sys/dev/pcmcia/if_malo_pcmciavar.h
--- a/sys/dev/pcmcia/if_malo_pcmciavar.h        Sun May 11 09:01:42 2014 +0000
+++ b/sys/dev/pcmcia/if_malo_pcmciavar.h        Mon May 12 02:26:19 2014 +0000
@@ -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 @@
        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];



Home | Main Index | Thread Index | Old Index