CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Apr 24 06:29:57 UTC 2015
Modified Files:
src/sys/rump: Makefile.rump README.compileopts
Log Message:
There are tests which rely on compat code continuing to be present,
so default RUMP_NBCOMPAT to all releases.
reported by gson
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/README.compileopts
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.110 src/sys/rump/Makefile.rump:1.111
--- src/sys/rump/Makefile.rump:1.110 Thu Apr 23 14:49:26 2015
+++ src/sys/rump/Makefile.rump Fri Apr 24 06:29:56 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.110 2015/04/23 14:49:26 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.111 2015/04/24 06:29:56 pooka Exp $
#
.if !defined(_RUMP_MK)
@@ -29,10 +29,7 @@ CPPFLAGS+= -DMIPS1=1
.endif
.endif
-RUMP_NBCOMPAT?= 60 70
-.if ${RUMP_NBCOMPAT} == all
-RUMP_NBCOMPAT= 50 60 70
-.endif
+RUMP_NBCOMPAT?= 50 60 70
# normalize alternatively accepted comma-separated list
RUMP_NBCOMPAT:= ${RUMP_NBCOMPAT:S/,/ /g}
CPPFLAGS+= ${RUMP_NBCOMPAT:C/[1-9]0/-DCOMPAT_/g}
Index: src/sys/rump/README.compileopts
diff -u src/sys/rump/README.compileopts:1.8 src/sys/rump/README.compileopts:1.9
--- src/sys/rump/README.compileopts:1.8 Thu Apr 23 14:49:26 2015
+++ src/sys/rump/README.compileopts Fri Apr 24 06:29:56 2015
@@ -1,4 +1,4 @@
- $NetBSD: README.compileopts,v 1.8 2015/04/23 14:49:26 pooka Exp $
+ $NetBSD: README.compileopts,v 1.9 2015/04/24 06:29:56 pooka Exp $
This file describes compile-time options for rump kernels. Additionally,
NetBSD build options will have an effect. See src/share/mk/bsd.README
@@ -79,8 +79,8 @@ effect: Control how curlwp is obtained i
RUMP_NBCOMPAT
-values: either a comma-separated list of releases (e.g. 50,60), or all
-defval: two previous NetBSD releases; check Makefile.rump
+values: comma-separated list of releases, e.g. 60,70
+defval: all
effect: Builds NetBSD COMPAT_nn code for each of the elements in the list.
This option is useful only when building rump kernels for
NetBSD userspace, and an empty value may be supplied elsewhere.
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: pgoyette
Date: Fri Apr 24 11:34:14 UTC 2015
Modified Files:
src/sys/dev/sysmon: sysmon_envsys.c
Log Message:
The sysmon_envsys module also depends on sysmon_power (for delivery of
sensor events to userland).
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/dev/sysmon/sysmon_envsys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.132 src/sys/dev/sysmon/sysmon_envsys.c:1.133
--- src/sys/dev/sysmon/sysmon_envsys.c:1.132 Fri Apr 24 03:32:25 2015
+++ src/sys/dev/sysmon/sysmon_envsys.c Fri Apr 24 11:34:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.132 2015/04/24 03:32:25 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.133 2015/04/24 11:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_envsys.c,v 1.132 2015/04/24 03:32:25 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_envsys.c,v 1.133 2015/04/24 11:34:14 pgoyette Exp $);
#include sys/param.h
#include sys/types.h
@@ -102,7 +102,7 @@ static void sme_initial_refresh(void *);
static uint32_t sme_get_max_value(struct sysmon_envsys *,
bool (*)(const envsys_data_t*), bool);
-MODULE(MODULE_CLASS_MISC, sysmon_envsys, sysmon,sysmon_taskq);
+MODULE(MODULE_CLASS_MISC, sysmon_envsys, sysmon,sysmon_taskq,sysmon_power);
static struct sysmon_opvec sysmon_envsys_opvec = {
sysmonopen_envsys, sysmonclose_envsys, sysmonioctl_envsys,
CVS commit: src/sys/netinet6
Module Name:src
Committed By: ozaki-r
Date: Fri Apr 24 08:53:06 UTC 2015
Modified Files:
src/sys/netinet6: ip6_output.c
Log Message:
Avoid NULL checks for a variable that is definitely NULL
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/netinet6/ip6_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.163 src/sys/netinet6/ip6_output.c:1.164
--- src/sys/netinet6/ip6_output.c:1.163 Mon Feb 2 03:14:02 2015
+++ src/sys/netinet6/ip6_output.c Fri Apr 24 08:53:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.163 2015/02/02 03:14:02 christos Exp $ */
+/* $NetBSD: ip6_output.c,v 1.164 2015/04/24 08:53:06 ozaki-r Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip6_output.c,v 1.163 2015/02/02 03:14:02 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip6_output.c,v 1.164 2015/04/24 08:53:06 ozaki-r Exp $);
#include opt_inet.h
#include opt_inet6.h
@@ -167,7 +167,7 @@ ip6_output(
bool tso;
struct route ip6route;
struct rtentry *rt = NULL;
- const struct sockaddr_in6 *dst = NULL;
+ const struct sockaddr_in6 *dst;
struct sockaddr_in6 src_sa, dst_sa;
int error = 0;
struct in6_ifaddr *ia = NULL;
@@ -543,8 +543,7 @@ ip6_output(
/* scope check is done. */
if (rt == NULL || IN6_IS_ADDR_MULTICAST(ip6-ip6_dst)) {
- if (dst == NULL)
- dst = satocsin6(rtcache_getdst(ro));
+ dst = satocsin6(rtcache_getdst(ro));
KASSERT(dst != NULL);
} else if (opt rtcache_validate(opt-ip6po_nextroute) != NULL) {
/*
@@ -555,7 +554,7 @@ ip6_output(
dst = (struct sockaddr_in6 *)opt-ip6po_nexthop;
} else if ((rt-rt_flags RTF_GATEWAY))
dst = (struct sockaddr_in6 *)rt-rt_gateway;
- else if (dst == NULL)
+ else
dst = satocsin6(rtcache_getdst(ro));
/*
CVS commit: src/share/misc
Module Name:src
Committed By: jmcneill
Date: Fri Apr 24 12:58:47 UTC 2015
Modified Files:
src/share/misc: acronyms
Log Message:
IKR: I know, right?
To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/share/misc/acronyms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.233 src/share/misc/acronyms:1.234
--- src/share/misc/acronyms:1.233 Fri Apr 24 01:17:32 2015
+++ src/share/misc/acronyms Fri Apr 24 12:58:47 2015
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.233 2015/04/24 01:17:32 rodent Exp $
+$NetBSD: acronyms,v 1.234 2015/04/24 12:58:47 jmcneill Exp $
10Q thank you
10X thanks
1337 elite (leet)
@@ -227,6 +227,7 @@ IHBW I have been wrong
IIANM if I am not mistaken
IIRC if I {recall,remember} correctly
IIUC if I understand correctly
+IKR I know, right?
IKWYM I know what you mean
ILU I love you
ILY I love you
CVS commit: src/sys/netatalk
Module Name:src
Committed By: rtr
Date: Fri Apr 24 23:36:49 UTC 2015
Modified Files:
src/sys/netatalk: ddp_usrreq.c
Log Message:
make at_pcbconnect() take sockaddr_at * instead of mbuf *.
move m_len check into callers which results in small duplication of
code that will go away when the callers are converted to receive
sockaddr * instead of mbuf *.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/netatalk/ddp_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netatalk/ddp_usrreq.c
diff -u src/sys/netatalk/ddp_usrreq.c:1.65 src/sys/netatalk/ddp_usrreq.c:1.66
--- src/sys/netatalk/ddp_usrreq.c:1.65 Fri Apr 24 22:32:37 2015
+++ src/sys/netatalk/ddp_usrreq.c Fri Apr 24 23:36:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ddp_usrreq.c,v 1.65 2015/04/24 22:32:37 rtr Exp $ */
+/* $NetBSD: ddp_usrreq.c,v 1.66 2015/04/24 23:36:48 rtr Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ddp_usrreq.c,v 1.65 2015/04/24 22:32:37 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: ddp_usrreq.c,v 1.66 2015/04/24 23:36:48 rtr Exp $);
#include opt_mbuftrace.h
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, $NetBSD: ddp_usrreq.c
static void at_pcbdisconnect(struct ddpcb *);
static void at_sockaddr(struct ddpcb *, struct sockaddr_at *);
static int at_pcbsetaddr(struct ddpcb *, struct sockaddr_at *);
-static int at_pcbconnect(struct ddpcb *, struct mbuf *);
+static int at_pcbconnect(struct ddpcb *, struct sockaddr_at *);
static void ddp_detach(struct socket *);
struct ifqueue atintrq1, atintrq2;
@@ -231,18 +231,15 @@ at_pcbsetaddr(struct ddpcb *ddp, struct
}
static int
-at_pcbconnect(struct ddpcb *ddp, struct mbuf *addr)
+at_pcbconnect(struct ddpcb *ddp, struct sockaddr_at *sat)
{
struct rtentry *rt;
const struct sockaddr_at *cdst;
- struct sockaddr_at *sat = mtod(addr, struct sockaddr_at *);
struct route *ro;
struct at_ifaddr *aa;
struct ifnet *ifp;
u_short hintnet = 0, net;
- if (addr-m_len != sizeof(*sat))
- return EINVAL;
if (sat-sat_family != AF_APPLETALK) {
return EAFNOSUPPORT;
}
@@ -435,7 +432,9 @@ ddp_connect(struct socket *so, struct mb
if (ddp-ddp_fsat.sat_port != ATADDR_ANYPORT)
return EISCONN;
- error = at_pcbconnect(ddp, nam);
+ if (nam-m_len != sizeof(struct sockaddr_at))
+ return EINVAL;
+ error = at_pcbconnect(ddp, mtod(nam, struct sockaddr_at *));
if (error == 0)
soisconnected(so);
@@ -550,7 +549,9 @@ ddp_send(struct socket *so, struct mbuf
if (ddp-ddp_fsat.sat_port != ATADDR_ANYPORT)
return EISCONN;
s = splnet();
- error = at_pcbconnect(ddp, nam);
+ if (nam-m_len != sizeof(struct sockaddr_at))
+ return EINVAL;
+ error = at_pcbconnect(ddp, mtod(nam, struct sockaddr_at *));
if (error) {
splx(s);
return error;
CVS commit: src/sys
Module Name:src
Committed By: rtr
Date: Fri Apr 24 22:32:38 UTC 2015
Modified Files:
src/sys/compat/svr4: svr4_stream.c
src/sys/kern: uipc_socket.c uipc_syscalls.c uipc_usrreq.c
src/sys/net: if_gre.c link_proto.c raw_cb.h raw_usrreq.c rtsock.c
src/sys/netatalk: ddp_usrreq.c
src/sys/netbt: hci_socket.c l2cap_socket.c rfcomm_socket.c sco_socket.c
src/sys/netinet: dccp_usrreq.c in_pcb.c in_pcb.h raw_ip.c tcp_usrreq.c
udp_usrreq.c
src/sys/netinet6: dccp6_usrreq.c in6_pcb.c in6_pcb.h raw_ip6.c
udp6_usrreq.c
src/sys/netipsec: keysock.c
src/sys/netmpls: mpls_proto.c
src/sys/netnatm: natm.c
src/sys/rump/net/lib/libsockin: sockin.c
src/sys/sys: param.h protosw.h socketvar.h
Log Message:
make accept, getsockname and getpeername syscalls use sockaddr_big and modify
pr_{accept,sockname,peername} nam parameter type from mbuf * to sockaddr *.
* retained use of mbuftypes[MT_SONAME] for now.
* bump to netbsd version 7.99.12 for parameter type change.
patch posted to tech-net@ 2015/04/19
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/compat/svr4/svr4_stream.c
cvs rdiff -u -r1.238 -r1.239 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.175 -r1.176 src/sys/kern/uipc_syscalls.c
cvs rdiff -u -r1.176 -r1.177 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.163 -r1.164 src/sys/net/if_gre.c
cvs rdiff -u -r1.25 -r1.26 src/sys/net/link_proto.c
cvs rdiff -u -r1.23 -r1.24 src/sys/net/raw_cb.h
cvs rdiff -u -r1.52 -r1.53 src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.168 -r1.169 src/sys/net/rtsock.c
cvs rdiff -u -r1.64 -r1.65 src/sys/netatalk/ddp_usrreq.c
cvs rdiff -u -r1.41 -r1.42 src/sys/netbt/hci_socket.c
cvs rdiff -u -r1.32 -r1.33 src/sys/netbt/l2cap_socket.c
cvs rdiff -u -r1.34 -r1.35 src/sys/netbt/rfcomm_socket.c \
src/sys/netbt/sco_socket.c
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/dccp_usrreq.c
cvs rdiff -u -r1.156 -r1.157 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.56 -r1.57 src/sys/netinet/in_pcb.h
cvs rdiff -u -r1.147 -r1.148 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.205 -r1.206 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.218 -r1.219 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet6/dccp6_usrreq.c
cvs rdiff -u -r1.135 -r1.136 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.42 -r1.43 src/sys/netinet6/in6_pcb.h
cvs rdiff -u -r1.137 -r1.138 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.117 -r1.118 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.45 -r1.46 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.25 -r1.26 src/sys/netmpls/mpls_proto.c
cvs rdiff -u -r1.46 -r1.47 src/sys/netnatm/natm.c
cvs rdiff -u -r1.59 -r1.60 src/sys/rump/net/lib/libsockin/sockin.c
cvs rdiff -u -r1.473 -r1.474 src/sys/sys/param.h
cvs rdiff -u -r1.61 -r1.62 src/sys/sys/protosw.h
cvs rdiff -u -r1.136 -r1.137 src/sys/sys/socketvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/svr4/svr4_stream.c
diff -u src/sys/compat/svr4/svr4_stream.c:1.83 src/sys/compat/svr4/svr4_stream.c:1.84
--- src/sys/compat/svr4/svr4_stream.c:1.83 Sun Apr 19 19:17:37 2015
+++ src/sys/compat/svr4/svr4_stream.c Fri Apr 24 22:32:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_stream.c,v 1.83 2015/04/19 19:17:37 rtr Exp $ */
+/* $NetBSD: svr4_stream.c,v 1.84 2015/04/24 22:32:37 rtr Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: svr4_stream.c,v 1.83 2015/04/19 19:17:37 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: svr4_stream.c,v 1.84 2015/04/24 22:32:37 rtr Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -872,11 +872,12 @@ svr4_stream_ti_ioctl(file_t *fp, struct
struct svr4_strm *st = svr4_stream_get(fp);
int error;
struct svr4_strmcmd sc;
- struct mbuf *name;
+ struct sockaddr_big sbig;
if (st == NULL)
return EINVAL;
+ sbig.sb_len = UCHAR_MAX;
sc.offs = 0x10;
if ((error = copyin(sub, skb, sizeof(skb))) != 0) {
@@ -887,14 +888,14 @@ svr4_stream_ti_ioctl(file_t *fp, struct
switch (cmd) {
case SVR4_TI_GETMYNAME:
DPRINTF((TI_GETMYNAME\n));
- error = do_sys_getsockname(fd, name);
+ error = do_sys_getsockname(fd, (struct sockaddr *)sbig);
if (error != 0)
return error;
break;
case SVR4_TI_GETPEERNAME:
DPRINTF((TI_GETPEERNAME\n));
- error = do_sys_getpeername(fd, name);
+ error = do_sys_getpeername(fd, (struct sockaddr *)sbig);
if (error != 0)
return error;
break;
@@ -913,12 +914,12 @@ svr4_stream_ti_ioctl(file_t *fp, struct
switch (st-s_family) {
case AF_INET:
- sockaddr_to_netaddr_in(sc, mtod(name, void *));
+ sockaddr_to_netaddr_in(sc, (struct sockaddr_in *)sbig);
skb.len = sizeof (struct sockaddr_in);
break;
case AF_LOCAL:
- sockaddr_to_netaddr_un(sc, mtod(name, void *));
+ sockaddr_to_netaddr_un(sc, (struct sockaddr_un *)sbig);
/* XXX: the
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: pgoyette
Date: Sat Apr 25 00:54:14 UTC 2015
Modified Files:
src/sys/dev/sysmon: sysmon_envsys.c
Log Message:
Release the mutex in the error path.
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/dev/sysmon/sysmon_envsys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.133 src/sys/dev/sysmon/sysmon_envsys.c:1.134
--- src/sys/dev/sysmon/sysmon_envsys.c:1.133 Fri Apr 24 11:34:14 2015
+++ src/sys/dev/sysmon/sysmon_envsys.c Sat Apr 25 00:54:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.133 2015/04/24 11:34:14 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.134 2015/04/25 00:54:14 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_envsys.c,v 1.133 2015/04/24 11:34:14 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_envsys.c,v 1.134 2015/04/25 00:54:14 pgoyette Exp $);
#include sys/param.h
#include sys/types.h
@@ -779,6 +779,7 @@ sysmon_envsys_register(struct sysmon_env
mutex_enter(sme_global_mtx);
if (!prop_dictionary_set(sme_propd, sme-sme_name, array)) {
error = EINVAL;
+ mutex_exit(sme_global_mtx);
DPRINTF((%s: prop_dictionary_set for '%s'\n, __func__,
sme-sme_name));
goto out;
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: pgoyette
Date: Sat Apr 25 02:41:42 UTC 2015
Modified Files:
src/sys/dev/sysmon: sysmon_envsys.c
Log Message:
Use tabs for indentation.
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/dev/sysmon/sysmon_envsys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.134 src/sys/dev/sysmon/sysmon_envsys.c:1.135
--- src/sys/dev/sysmon/sysmon_envsys.c:1.134 Sat Apr 25 00:54:14 2015
+++ src/sys/dev/sysmon/sysmon_envsys.c Sat Apr 25 02:41:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.134 2015/04/25 00:54:14 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.135 2015/04/25 02:41:42 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_envsys.c,v 1.134 2015/04/25 00:54:14 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_envsys.c,v 1.135 2015/04/25 02:41:42 pgoyette Exp $);
#include sys/param.h
#include sys/types.h
@@ -687,8 +687,8 @@ sysmon_envsys_register(struct sysmon_env
mutex_enter(sme_global_mtx);
LIST_FOREACH(lsme, sysmon_envsys_list, sme_list) {
if (strcmp(lsme-sme_name, sme-sme_name) == 0) {
- mutex_exit(sme_global_mtx);
- return EEXIST;
+ mutex_exit(sme_global_mtx);
+ return EEXIST;
}
}
mutex_exit(sme_global_mtx);
CVS commit: [netbsd-7] src/distrib/sets/lists/debug
Module Name:src Committed By: snj Date: Fri Apr 24 17:14:07 UTC 2015 Modified Files: src/distrib/sets/lists/debug [netbsd-7]: mi Log Message: Pull up following revision(s) (requested by riz in ticket #721): distrib/sets/lists/debug/mi: revision 1.111 Add missing debug entry for bozohttpd To generate a diff of this commit: cvs rdiff -u -r1.81.2.3 -r1.81.2.4 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.81.2.3 src/distrib/sets/lists/debug/mi:1.81.2.4 --- src/distrib/sets/lists/debug/mi:1.81.2.3 Sun Jan 25 00:19:25 2015 +++ src/distrib/sets/lists/debug/mi Fri Apr 24 17:14:07 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.81.2.3 2015/01/25 00:19:25 martin Exp $ +# $NetBSD: mi,v 1.81.2.4 2015/04/24 17:14:07 snj Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -889,6 +889,7 @@ ./usr/libdata/debug/usr/libexec/atf-format.debug comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/atf-killpg.debug comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/atrun.debug comp-cron-debug debug +./usr/libdata/debug/usr/libexec/bozohttpd.debug comp-netutil-debug debug ./usr/libdata/debug/usr/libexec/cc1.debug comp-c-debug gcccmds,debug ./usr/libdata/debug/usr/libexec/cc1obj.debug comp-objc-debug gcccmds,debug ./usr/libdata/debug/usr/libexec/cc1plus.debug comp-cxx-debug gcccmds,debug
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Fri Apr 24 17:22:13 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 721 To generate a diff of this commit: cvs rdiff -u -r1.1.2.268 -r1.1.2.269 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.268 src/doc/CHANGES-7.0:1.1.2.269 --- src/doc/CHANGES-7.0:1.1.2.268 Thu Apr 23 19:55:08 2015 +++ src/doc/CHANGES-7.0 Fri Apr 24 17:22:13 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.268 2015/04/23 19:55:08 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.269 2015/04/24 17:22:13 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -20335,3 +20335,8 @@ usr.bin/mail/send.c1.38 invocations. [christos, ticket #719] +distrib/sets/lists/debug/mi 1.111 + + Add missing debug entry for bozohttpd + [riz, ticket #721] +
CVS commit: src/sys/netinet6
Module Name:src
Committed By: ozaki-r
Date: Fri Apr 24 07:51:43 UTC 2015
Modified Files:
src/sys/netinet6: in6_gif.c
Log Message:
Add missing rtcache_free
It's the same as other similar code paths in in_gif and ip6_etherip.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/netinet6/in6_gif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.60 src/sys/netinet6/in6_gif.c:1.61
--- src/sys/netinet6/in6_gif.c:1.60 Sun May 18 14:46:16 2014
+++ src/sys/netinet6/in6_gif.c Fri Apr 24 07:51:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_gif.c,v 1.60 2014/05/18 14:46:16 rmind Exp $ */
+/* $NetBSD: in6_gif.c,v 1.61 2015/04/24 07:51:43 ozaki-r Exp $ */
/* $KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: in6_gif.c,v 1.60 2014/05/18 14:46:16 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: in6_gif.c,v 1.61 2015/04/24 07:51:43 ozaki-r Exp $);
#include opt_inet.h
@@ -184,6 +184,7 @@ in6_gif_output(struct ifnet *ifp, int fa
/* If the route constitutes infinite encapsulation, punt. */
if (rt-rt_ifp == ifp) {
+ rtcache_free(sc-gif_ro);
m_freem(m);
return ENETUNREACH; /* XXX */
}
CVS commit: src/sys/dev/sysmon
Module Name:src Committed By: christos Date: Fri Apr 24 19:49:24 UTC 2015 Modified Files: src/sys/dev/sysmon: swwdog.c Log Message: We only need the _cd when we are a module. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/dev/sysmon/swwdog.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/sysmon/swwdog.c diff -u src/sys/dev/sysmon/swwdog.c:1.16 src/sys/dev/sysmon/swwdog.c:1.17 --- src/sys/dev/sysmon/swwdog.c:1.16 Thu Apr 23 19:23:01 2015 +++ src/sys/dev/sysmon/swwdog.c Fri Apr 24 15:49:24 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: swwdog.c,v 1.16 2015/04/23 23:23:01 pgoyette Exp $ */ +/* $NetBSD: swwdog.c,v 1.17 2015/04/24 19:49:24 christos Exp $ */ /* * Copyright (c) 2004, 2005 Steven M. Bellovin @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: swwdog.c,v 1.16 2015/04/23 23:23:01 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: swwdog.c,v 1.17 2015/04/24 19:49:24 christos Exp $); /* * @@ -71,7 +71,9 @@ static device_t swwdog_dev; MODULE(MODULE_CLASS_DRIVER, swwdog, sysmon_wdog); +#ifdef _MODULE CFDRIVER_DECL(swwdog, DV_DULL, NULL); +#endif int swwdogattach(int);
