CVS commit: [netbsd-6-0] src/sys/net

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Thu Aug  7 09:53:29 UTC 2014

Modified Files:
        src/sys/net [netbsd-6-0]: link_proto.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1103):
        sys/net/link_proto.c    revision 1.17
Don't assume if_init is always set. if_init may be NULL, e.g., if_vlan.
PR kern/48997.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.14.1 src/sys/net/link_proto.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/link_proto.c
diff -u src/sys/net/link_proto.c:1.7 src/sys/net/link_proto.c:1.7.14.1
--- src/sys/net/link_proto.c:1.7	Fri Oct  7 16:34:31 2011
+++ src/sys/net/link_proto.c	Thu Aug  7 09:53:29 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: link_proto.c,v 1.7 2011/10/07 16:34:31 dyoung Exp $	*/
+/*	$NetBSD: link_proto.c,v 1.7.14.1 2014/08/07 09:53:29 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: link_proto.c,v 1.7 2011/10/07 16:34:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: link_proto.c,v 1.7.14.1 2014/08/07 09:53:29 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -197,7 +197,8 @@ link_control(struct socket *so, unsigned
 		splx(s);
 		if (error != ENETRESET)
 			return error;
-		else if ((ifp->if_flags & IFF_RUNNING) != 0)
+		else if ((ifp->if_flags & IFF_RUNNING) != 0 &&
+		         ifp->if_init != NULL)
 			return (*ifp->if_init)(ifp);
 		else
 			return 0;