Module Name: src
Committed By: rmind
Date: Sun May 18 00:10:11 UTC 2014
Modified Files:
src/sys/netinet: raw_ip.c
src/sys/netinet6: icmp6.c raw_ip6.c
Log Message:
Use IFNET_FIRST() rather than open coding ifnet access.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.165 -r1.166 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.113 -r1.114 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/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.118 src/sys/netinet/raw_ip.c:1.119
--- src/sys/netinet/raw_ip.c:1.118 Tue Feb 25 18:30:12 2014
+++ src/sys/netinet/raw_ip.c Sun May 18 00:10:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.118 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: raw_ip.c,v 1.119 2014/05/18 00:10:11 rmind Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.118 2014/02/25 18:30:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.119 2014/05/18 00:10:11 rmind Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -474,7 +474,7 @@ rip_bind(struct inpcb *inp, struct mbuf
if (nam->m_len != sizeof(*addr))
return (EINVAL);
- if (TAILQ_FIRST(&ifnet) == 0)
+ if (!IFNET_FIRST())
return (EADDRNOTAVAIL);
if (addr->sin_family != AF_INET)
return (EAFNOSUPPORT);
@@ -492,7 +492,7 @@ rip_connect(struct inpcb *inp, struct mb
if (nam->m_len != sizeof(*addr))
return (EINVAL);
- if (TAILQ_FIRST(&ifnet) == 0)
+ if (!IFNET_FIRST())
return (EADDRNOTAVAIL);
if (addr->sin_family != AF_INET)
return (EAFNOSUPPORT);
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.165 src/sys/netinet6/icmp6.c:1.166
--- src/sys/netinet6/icmp6.c:1.165 Tue Feb 25 18:30:12 2014
+++ src/sys/netinet6/icmp6.c Sun May 18 00:10:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.165 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: icmp6.c,v 1.166 2014/05/18 00:10:11 rmind Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.165 2014/02/25 18:30:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.166 2014/05/18 00:10:11 rmind Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1717,7 +1717,7 @@ ni6_store_addrs(struct icmp6_nodeinfo *n
struct icmp6_nodeinfo *nni6, struct ifnet *ifp0,
int resid)
{
- struct ifnet *ifp = ifp0 ? ifp0 : TAILQ_FIRST(&ifnet);
+ struct ifnet *ifp = ifp0 ? ifp0 : IFNET_FIRST();
struct in6_ifaddr *ifa6;
struct ifaddr *ifa;
struct ifnet *ifp_dep = NULL;
Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.113 src/sys/netinet6/raw_ip6.c:1.114
--- src/sys/netinet6/raw_ip6.c:1.113 Tue Feb 25 18:30:12 2014
+++ src/sys/netinet6/raw_ip6.c Sun May 18 00:10:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip6.c,v 1.113 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: raw_ip6.c,v 1.114 2014/05/18 00:10:11 rmind 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.113 2014/02/25 18:30:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.114 2014/05/18 00:10:11 rmind Exp $");
#include "opt_ipsec.h"
@@ -677,7 +677,7 @@ rip6_usrreq(struct socket *so, int req,
error = EINVAL;
break;
}
- if (TAILQ_EMPTY(&ifnet) || addr->sin6_family != AF_INET6) {
+ if (!IFNET_FIRST() || addr->sin6_family != AF_INET6) {
error = EADDRNOTAVAIL;
break;
}
@@ -718,7 +718,7 @@ rip6_usrreq(struct socket *so, int req,
error = EINVAL;
break;
}
- if (TAILQ_EMPTY(&ifnet)) {
+ if (!IFNET_FIRST()) {
error = EADDRNOTAVAIL;
break;
}
