diff options
| author |   mpi <mpi@openbsd.org> | 2015-02-10 03:51:58 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-02-10 03:51:58 +0000 |
| commit | a89ced5af7772ce4a2024c4956468ad11b37053d (patch) | |
| tree | d8d8b142fa5cd58d625fb02287407120ea29f375 | |
| parent | Zap m_act here too. (diff) | |
| download | wireguard-openbsd-a89ced5af7772ce4a2024c4956468ad11b37053d.tar.xz wireguard-openbsd-a89ced5af7772ce4a2024c4956468ad11b37053d.zip | |
Do not abuse `rcvif'.
ok deraadt@
| -rw-r--r-- | sys/dev/pci/if_devar.h | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_lmcvar.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pci/if_devar.h b/sys/dev/pci/if_devar.h index b0b2fd0f7a7..bccb72fcefa 100644 --- a/sys/dev/pci/if_devar.h +++ b/sys/dev/pci/if_devar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_devar.h,v 1.32 2011/04/03 15:36:02 jasper Exp $ */ +/* $OpenBSD: if_devar.h,v 1.33 2015/02/10 03:51:58 mpi Exp $ */ /* $NetBSD: if_devar.h,v 1.13 1997/06/08 18:46:36 thorpej Exp $ */ /*- @@ -863,5 +863,5 @@ TULIP_PERFREAD( && ((u_int16_t *)a1)[1] == 0xFFFFU \ && ((u_int16_t *)a1)[2] == 0xFFFFU) -#define TULIP_GETCTX(m, t) ((t) (m)->m_pkthdr.rcvif + 0) -#define TULIP_SETCTX(m, c) ((void) ((m)->m_pkthdr.rcvif = (void *) (c))) +#define TULIP_GETCTX(m, t) ((t) (m)->m_pkthdr.ph_cookie + 0) +#define TULIP_SETCTX(m, c) ((void) ((m)->m_pkthdr.ph_cookie = (void *)(c))) diff --git a/sys/dev/pci/if_lmcvar.h b/sys/dev/pci/if_lmcvar.h index 96dba4a39a3..fa5a5764251 100644 --- a/sys/dev/pci/if_lmcvar.h +++ b/sys/dev/pci/if_lmcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lmcvar.h,v 1.11 2007/09/03 00:47:37 krw Exp $ */ +/* $OpenBSD: if_lmcvar.h,v 1.12 2015/02/10 03:51:58 mpi Exp $ */ /* $NetBSD: if_lmcvar.h,v 1.1 1999/03/25 03:32:43 explorer Exp $ */ /*- @@ -571,5 +571,5 @@ extern struct cfdriver lmc_cd; typedef int lmc_spl_t; -#define LMC_GETCTX(m, t) ((t) (m)->m_pkthdr.rcvif + 0) -#define LMC_SETCTX(m, c) ((void) ((m)->m_pkthdr.rcvif = (void *) (c))) +#define LMC_GETCTX(m, t) ((t) (m)->m_pkthdr.ph_cookie + 0) +#define LMC_SETCTX(m, c) ((void) ((m)->m_pkthdr.ph_cookie = (void *)(c))) |