Module Name: src
Committed By: ozaki-r
Date: Thu Jul 31 02:21:51 UTC 2014
Modified Files:
src/sys/net: if.h
src/sys/netinet: raw_ip.c
src/sys/netinet6: raw_ip6.c
Log Message:
Define IFNET_EMPTY() and replace !IFNET_FIRST() with it
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/sys/net/if.h
cvs rdiff -u -r1.137 -r1.138 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.130 -r1.131 src/sys/netinet6/raw_ip6.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/net/if.h
diff -u src/sys/net/if.h:1.172 src/sys/net/if.h:1.173
--- src/sys/net/if.h:1.172 Wed Jul 16 03:17:26 2014
+++ src/sys/net/if.h Thu Jul 31 02:21:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.172 2014/07/16 03:17:26 ozaki-r Exp $ */
+/* $NetBSD: if.h,v 1.173 2014/07/31 02:21:51 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -981,6 +981,7 @@ __END_DECLS
#ifdef _KERNEL
#define IFNET_FIRST() TAILQ_FIRST(&ifnet_list)
+#define IFNET_EMPTY() TAILQ_EMPTY(&ifnet_list)
#define IFNET_NEXT(__ifp) TAILQ_NEXT((__ifp), if_list)
#define IFNET_FOREACH(__ifp) TAILQ_FOREACH(__ifp, &ifnet_list, if_list)
#define IFADDR_FIRST(__ifp) TAILQ_FIRST(&(__ifp)->if_addrlist)
Index: src/sys/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.137 src/sys/netinet/raw_ip.c:1.138
--- src/sys/netinet/raw_ip.c:1.137 Wed Jul 30 10:04:26 2014
+++ src/sys/netinet/raw_ip.c Thu Jul 31 02:21:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.137 2014/07/30 10:04:26 rtr Exp $ */
+/* $NetBSD: raw_ip.c,v 1.138 2014/07/31 02:21:51 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.137 2014/07/30 10:04:26 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.138 2014/07/31 02:21:51 ozaki-r Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -487,7 +487,7 @@ rip_connect_pcb(struct inpcb *inp, struc
if (nam->m_len != sizeof(*addr))
return (EINVAL);
- if (!IFNET_FIRST())
+ if (IFNET_EMPTY())
return (EADDRNOTAVAIL);
if (addr->sin_family != AF_INET)
return (EAFNOSUPPORT);
@@ -575,7 +575,7 @@ rip_bind(struct socket *so, struct mbuf
error = EINVAL;
goto release;
}
- if (!IFNET_FIRST()) {
+ if (IFNET_EMPTY()) {
error = EADDRNOTAVAIL;
goto release;
}
Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.130 src/sys/netinet6/raw_ip6.c:1.131
--- src/sys/netinet6/raw_ip6.c:1.130 Wed Jul 30 10:04:26 2014
+++ src/sys/netinet6/raw_ip6.c Thu Jul 31 02:21:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip6.c,v 1.130 2014/07/30 10:04:26 rtr Exp $ */
+/* $NetBSD: raw_ip6.c,v 1.131 2014/07/31 02:21:51 ozaki-r Exp $ */
/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.130 2014/07/30 10:04:26 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.131 2014/07/31 02:21:51 ozaki-r Exp $");
#include "opt_ipsec.h"
@@ -667,7 +667,7 @@ rip6_bind(struct socket *so, struct mbuf
addr = mtod(nam, struct sockaddr_in6 *);
if (nam->m_len != sizeof(*addr))
return EINVAL;
- if (!IFNET_FIRST() || addr->sin6_family != AF_INET6)
+ if (IFNET_EMPTY() || addr->sin6_family != AF_INET6)
return EADDRNOTAVAIL;
if ((error = sa6_embedscope(addr, ip6_use_defzone)) != 0)
@@ -716,7 +716,7 @@ rip6_connect(struct socket *so, struct m
if (nam->m_len != sizeof(*addr))
return EINVAL;
- if (!IFNET_FIRST())
+ if (IFNET_EMPTY())
return EADDRNOTAVAIL;
if (addr->sin6_family != AF_INET6)
return EAFNOSUPPORT;
