Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netipsec Use key_senderror
details: https://anonhg.NetBSD.org/src/rev/59e6f13720ac
branches: trunk
changeset: 824269:59e6f13720ac
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Tue May 30 09:39:53 2017 +0000
description:
Use key_senderror
diffstat:
sys/netipsec/key.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diffs (44 lines):
diff -r a6b572b010ed -r 59e6f13720ac sys/netipsec/key.c
--- a/sys/netipsec/key.c Tue May 30 09:39:08 2017 +0000
+++ b/sys/netipsec/key.c Tue May 30 09:39:53 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.149 2017/05/30 09:39:08 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.150 2017/05/30 09:39:53 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.149 2017/05/30 09:39:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.150 2017/05/30 09:39:53 ozaki-r Exp $");
/*
* This code is referd to RFC 2367
@@ -7287,7 +7287,6 @@
struct sadb_msghdr mh;
u_int orglen;
int error;
- int target;
KASSERT(m != NULL);
KASSERT(so != NULL);
@@ -7306,7 +7305,6 @@
}
msg = mtod(m, struct sadb_msg *);
orglen = PFKEY_UNUNIT64(msg->sadb_msg_len);
- target = KEY_SENDUP_ONE;
if ((m->m_flags & M_PKTHDR) == 0 ||
m->m_pkthdr.len != orglen) {
@@ -7526,8 +7524,7 @@
return (*key_typesw[msg->sadb_msg_type])(so, m, &mh);
senderror:
- msg->sadb_msg_errno = error;
- return key_sendup_mbuf(so, m, target);
+ return key_senderror(so, m, error);
}
static int
Home |
Main Index |
Thread Index |
Old Index