From owner-p4-projects@FreeBSD.ORG Thu Jul 3 09:32:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 544931065686; Thu, 3 Jul 2008 09:32:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 168161065679 for ; Thu, 3 Jul 2008 09:32:14 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F35958FC19 for ; Thu, 3 Jul 2008 09:32:13 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m639WDmw026174 for ; Thu, 3 Jul 2008 09:32:13 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m639WD4A026172 for perforce@freebsd.org; Thu, 3 Jul 2008 09:32:13 GMT (envelope-from julian@freebsd.org) Date: Thu, 3 Jul 2008 09:32:13 GMT Message-Id: <200807030932.m639WD4A026172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 144543 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2008 09:32:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=144543 Change 144543 by julian@julian_trafmon1 on 2008/07/03 09:31:58 ifnet_byindex and friends need INIT_VNET_NET() Affected files ... .. //depot/projects/vimage/src/sys/net/if.c#30 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if.c#30 (text+ko) ==== @@ -151,12 +151,12 @@ static int if_indexlim; static struct knlist ifklist; -#endif /* !VIMAGE */ /* * Table of ifnet/cdev by index. Locked with ifnet_lock. */ static struct ifindex_entry *ifindex_table = NULL; +#endif /* !VIMAGE */ static void filt_netdetach(struct knote *kn); static int filt_netdev(struct knote *kn, long hint); @@ -190,10 +190,11 @@ struct ifnet * ifnet_byindex(u_short idx) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; IFNET_RLOCK(); - ifp = ifindex_table[idx].ife_ifnet; + ifp = V_ifindex_table[idx].ife_ifnet; IFNET_RUNLOCK(); return (ifp); } @@ -202,9 +203,10 @@ ifnet_setbyindex(u_short idx, struct ifnet *ifp) { + INIT_VNET_NET(curvnet); IFNET_WLOCK_ASSERT(); - ifindex_table[idx].ife_ifnet = ifp; + V_ifindex_table[idx].ife_ifnet = ifp; } struct ifaddr * @@ -221,10 +223,11 @@ struct cdev * ifdev_byindex(u_short idx) { + INIT_VNET_NET(curvnet); struct cdev *cdev; IFNET_RLOCK(); - cdev = ifindex_table[idx].ife_dev; + cdev = V_ifindex_table[idx].ife_dev; IFNET_RUNLOCK(); return (cdev); } @@ -233,8 +236,9 @@ ifdev_setbyindex(u_short idx, struct cdev *cdev) { + INIT_VNET_NET(curvnet); IFNET_WLOCK(); - ifindex_table[idx].ife_dev = cdev; + V_ifindex_table[idx].ife_dev = cdev; IFNET_WUNLOCK(); } @@ -268,7 +272,6 @@ static int netioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) { - INIT_VNET_NET(curvnet); struct ifnet *ifp; int error, idx; @@ -379,15 +382,8 @@ vnet_net_iattach(NULL); #endif IFNET_LOCK_INIT(); -#ifdef VIMAGE - if (IS_DEFAULT_VNET(curvnet)) { - INIT_VNET_NET(curvnet); -#endif ifdev_setbyindex(0, make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "network")); -#ifdef VIMAGE - } -#endif if_clone_init(); }