diff options
author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-05-20 14:03:06 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-05-20 14:03:06 +0000 |
commit | 93081d9fe99916d46810d0fe0f348a395107daa6 (patch) | |
tree | 27029c7ab6c88ce265f46ba8a00cee44890d60b5 /sys/dev/ic/if_wi.c | |
parent | 94217d980b9834da1bd897f8376e90643d474304 (diff) |
Split some copies of two struct members together into two bcopy rather
than one to make gcc4 -Wbounded happy.
ok krw
Diffstat (limited to 'sys/dev/ic/if_wi.c')
-rw-r--r-- | sys/dev/ic/if_wi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c index ca8c40c185b..7355ce948d6 100644 --- a/sys/dev/ic/if_wi.c +++ b/sys/dev/ic/if_wi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi.c,v 1.146 2009/10/27 23:59:34 deraadt Exp $ */ +/* $OpenBSD: if_wi.c,v 1.147 2010/05/20 14:03:05 nicm Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -2423,7 +2423,8 @@ nextpkt: /* Do host encryption. */ tx_frame.wi_frame_ctl |= htole16(WI_FCTL_WEP); - bcopy(&tx_frame.wi_dat[0], &sc->wi_txbuf[4], 8); + bcopy(&tx_frame.wi_dat[0], &sc->wi_txbuf[4], 6); + bcopy(&tx_frame.wi_type, &sc->wi_txbuf[10], 2); m_copydata(m0, sizeof(struct ether_header), m0->m_pkthdr.len - sizeof(struct ether_header), |