diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-07-15 17:33:49 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-07-15 17:33:49 +0000 |
| commit | 8dde2e263770b82a26f5b4d5c362b158426de97c (patch) | |
| tree | 929a7b587967fbd341c6fdc0d584f583a0ad3dbd | |
| parent | a368a3e505dc126b0878d770090a9ea2383b12b0 (diff) | |
rename mbuf ** parameter from m to mp, to match other similar code
ok mpi
| -rw-r--r-- | sys/netinet/ip_ether.c | 14 | ||||
| -rw-r--r-- | sys/netinet/ip_ipip.c | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/netinet/ip_ether.c b/sys/netinet/ip_ether.c index b187a59d2ad..9ddc3c81387 100644 --- a/sys/netinet/ip_ether.c +++ b/sys/netinet/ip_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ether.c,v 1.74 2015/07/02 09:40:03 mpi Exp $ */ +/* $OpenBSD: ip_ether.c,v 1.75 2015/07/15 17:33:48 deraadt Exp $ */ /* * The author of this code is Angelos D. Keromytis (kermit@adk.gr) * @@ -129,30 +129,30 @@ etherip_input(struct mbuf *m, ...) #ifdef INET6 int -etherip_input6(struct mbuf **m, int *offp, int proto) +etherip_input6(struct mbuf **mp, int *offp, int proto) { switch (proto) { #if NBRIDGE > 0 case IPPROTO_ETHERIP: /* If we do not accept EtherIP explicitly, drop. */ - if (!etherip_allow && ((*m)->m_flags & (M_AUTH|M_CONF)) == 0) { + if (!etherip_allow && ((*mp)->m_flags & (M_AUTH|M_CONF)) == 0) { DPRINTF(("etherip_input6(): dropped due to policy\n")); etheripstat.etherip_pdrops++; - m_freem(*m); + m_freem(*mp); return IPPROTO_DONE; } - etherip_decap(*m, *offp); + etherip_decap(*mp, *offp); return IPPROTO_DONE; #endif #ifdef MPLS case IPPROTO_MPLS: - mplsip_decap(*m, *offp); + mplsip_decap(*mp, *offp); return IPPROTO_DONE; #endif default: DPRINTF(("etherip_input6(): dropped, unhandled protocol\n")); etheripstat.etherip_pdrops++; - m_freem(*m); + m_freem(*mp); return IPPROTO_DONE; } } diff --git a/sys/netinet/ip_ipip.c b/sys/netinet/ip_ipip.c index b3cadd21b0f..d19ec153b21 100644 --- a/sys/netinet/ip_ipip.c +++ b/sys/netinet/ip_ipip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipip.c,v 1.60 2015/06/16 11:09:40 mpi Exp $ */ +/* $OpenBSD: ip_ipip.c,v 1.61 2015/07/15 17:33:48 deraadt Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -91,17 +91,17 @@ struct ipipstat ipipstat; * Really only a wrapper for ipip_input(), for use with IPv6. */ int -ip4_input6(struct mbuf **m, int *offp, int proto) +ip4_input6(struct mbuf **mp, int *offp, int proto) { /* If we do not accept IP-in-IP explicitly, drop. */ - if (!ipip_allow && ((*m)->m_flags & (M_AUTH|M_CONF)) == 0) { + if (!ipip_allow && ((*mp)->m_flags & (M_AUTH|M_CONF)) == 0) { DPRINTF(("ip4_input6(): dropped due to policy\n")); ipipstat.ipips_pdrops++; - m_freem(*m); + m_freem(*mp); return IPPROTO_DONE; } - ipip_input(*m, *offp, NULL, proto); + ipip_input(*mp, *offp, NULL, proto); return IPPROTO_DONE; } #endif /* INET6 */ |