diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-06-11 18:15:56 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-06-11 18:15:56 +0000 |
| commit | 11fcc68fad30620c6ac87dba9b240103f5cbc4e6 (patch) | |
| tree | a2f7140c0e82286b40dda1a6da540fefba2e3cf9 /sys/dev/pci | |
| parent | 053f2c9694efd78cad0fb364e18939d590655719 (diff) | |
Replace all ovbcopy with memmove; swap the src and dst arguments too
ok otto
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_wpi.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index de58cd008a1..1b4eee7daaa 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.119 2013/05/29 23:16:52 yuo Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.120 2013/06/11 18:15:52 deraadt Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1826,7 +1826,7 @@ iwn_ccmp_decap(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_key *k) /* Clear Protected bit and strip IV. */ wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED; - ovbcopy(wh, mtod(m, caddr_t) + IEEE80211_CCMP_HDRLEN, hdrlen); + memmove(mtod(m, caddr_t) + IEEE80211_CCMP_HDRLEN, wh, hdrlen); m_adj(m, IEEE80211_CCMP_HDRLEN); /* Strip MIC. */ m_adj(m, -IEEE80211_CCMP_MICLEN); diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index f4f93b357b2..693bfb9c32d 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.110 2011/06/02 18:36:53 mk Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.111 2013/06/11 18:15:52 deraadt Exp $ */ /*- * Copyright (c) 2006-2008 @@ -1155,7 +1155,7 @@ wpi_ccmp_decap(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_key *k) /* Clear Protected bit and strip IV. */ wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED; - ovbcopy(wh, mtod(m, caddr_t) + IEEE80211_CCMP_HDRLEN, hdrlen); + memmove(mtod(m, caddr_t) + IEEE80211_CCMP_HDRLEN, wh, hdrlen); m_adj(m, IEEE80211_CCMP_HDRLEN); /* Strip MIC. */ m_adj(m, -IEEE80211_CCMP_MICLEN); |