From owner-p4-projects@FreeBSD.ORG Mon Feb 7 16:53:18 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DCAD16A4D0; Mon, 7 Feb 2005 16:53:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F4D316A4CE for ; Mon, 7 Feb 2005 16:53:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5756743D45 for ; Mon, 7 Feb 2005 16:53:17 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17GrHit026533 for ; Mon, 7 Feb 2005 16:53:17 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17GrH2Y026530 for perforce@freebsd.org; Mon, 7 Feb 2005 16:53:17 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Feb 2005 16:53:17 GMT Message-Id: <200502071653.j17GrH2Y026530@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 70515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 16:53:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=70515 Change 70515 by jhb@jhb_slimer on 2005/02/07 16:52:24 Ooops, fix UP kernels in this branch by including spurious_int in all kernels. Affected files ... .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#11 edit .. //depot/projects/smpng/sys/i386/i386/exception.s#22 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/apic_vector.s#11 (text+ko) ==== @@ -107,6 +107,8 @@ iret +#ifdef DEV_APIC + ISR_VEC(1, apic_isr1) ISR_VEC(2, apic_isr2) ISR_VEC(3, apic_isr3) @@ -357,3 +359,4 @@ POP_FRAME iret #endif /* SMP */ +#endif /* DEV_APIC */ ==== //depot/projects/smpng/sys/i386/i386/exception.s#22 (text+ko) ==== @@ -234,14 +234,12 @@ #include -#ifdef DEV_APIC .data .p2align 4 .text SUPERALIGN_TEXT #include -#endif .data .p2align 4 From owner-p4-projects@FreeBSD.ORG Mon Feb 7 16:55:21 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 290C516A4D0; Mon, 7 Feb 2005 16:55:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0375016A4CE for ; Mon, 7 Feb 2005 16:55:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC35F43D53 for ; Mon, 7 Feb 2005 16:55:20 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17GtKOj026670 for ; Mon, 7 Feb 2005 16:55:20 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17GtKxe026667 for perforce@freebsd.org; Mon, 7 Feb 2005 16:55:20 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Feb 2005 16:55:20 GMT Message-Id: <200502071655.j17GtKxe026667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 70517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 16:55:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=70517 Change 70517 by jhb@jhb_slimer on 2005/02/07 16:54:57 Geez, add a newline so gcc doesn't get its panties all in a bunch. Affected files ... .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#12 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/apic_vector.s#12 (text+ko) ==== @@ -359,4 +359,4 @@ POP_FRAME iret #endif /* SMP */ -#endif /* DEV_APIC */+#endif /* DEV_APIC */ From owner-p4-projects@FreeBSD.ORG Mon Feb 7 17:40:50 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6562B16A4D0; Mon, 7 Feb 2005 17:40:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2104E16A4CE for ; Mon, 7 Feb 2005 17:40:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C978B43D5C for ; Mon, 7 Feb 2005 17:40:49 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17HenD9028224 for ; Mon, 7 Feb 2005 17:40:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17Henbj028221 for perforce@freebsd.org; Mon, 7 Feb 2005 17:40:49 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Feb 2005 17:40:49 GMT Message-Id: <200502071740.j17Henbj028221@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 70523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 17:40:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=70523 Change 70523 by sam@sam_ebb on 2005/02/07 17:40:26 revise cloning support to take an optional device-specific parameter block Affected files ... .. //depot/projects/vap/sys/net/if.c#2 edit .. //depot/projects/vap/sys/net/if_clone.c#2 edit .. //depot/projects/vap/sys/net/if_clone.h#2 edit .. //depot/projects/vap/sys/net/if_disc.c#2 edit .. //depot/projects/vap/sys/net/if_faith.c#2 edit .. //depot/projects/vap/sys/net/if_gif.c#2 edit .. //depot/projects/vap/sys/net/if_gre.c#2 edit .. //depot/projects/vap/sys/net/if_loop.c#2 edit .. //depot/projects/vap/sys/net/if_ppp.c#2 edit .. //depot/projects/vap/sys/net/if_stf.c#2 edit .. //depot/projects/vap/sys/net/if_vlan.c#2 edit .. //depot/projects/wifi/sbin/ifconfig/ifclone.c#6 edit .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#11 edit .. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#9 edit .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#37 edit .. //depot/projects/wifi/sbin/ifconfig/ifvlan.c#8 edit Differences ... ==== //depot/projects/vap/sys/net/if.c#2 (text+ko) ==== @@ -1381,7 +1381,7 @@ if ((error = suser(td)) != 0) return (error); return ((cmd == SIOCIFCREATE) ? - if_clone_create(ifr->ifr_name, sizeof(ifr->ifr_name)) : + if_clone_create(ifr->ifr_name, sizeof(ifr->ifr_name), ifr->ifr_data) : if_clone_destroy(ifr->ifr_name)); case SIOCIFGCLONERS: ==== //depot/projects/vap/sys/net/if_clone.c#2 (text+ko) ==== @@ -112,7 +112,7 @@ * Create a clone network interface. */ int -if_clone_create(char *name, size_t len) +if_clone_create(char *name, size_t len, caddr_t params) { int err; struct if_clone *ifc; @@ -133,7 +133,7 @@ if (ifc == NULL) return (EINVAL); - err = (*ifc->ifc_create)(ifc, name, len); + err = (*ifc->ifc_create)(ifc, name, len, params); IF_CLONE_REMREF(ifc); return (err); } @@ -396,7 +396,7 @@ for (unit = 0; unit < ifcs->ifcs_minifs; unit++) { snprintf(name, IFNAMSIZ, "%s%d", ifc->ifc_name, unit); - err = (*ifc->ifc_create)(ifc, name, IFNAMSIZ); + err = (*ifc->ifc_create)(ifc, name, IFNAMSIZ, (caddr_t) 0); KASSERT(err == 0, ("%s: failed to create required interface %s", __func__, name)); @@ -425,7 +425,7 @@ } int -ifc_simple_create(struct if_clone *ifc, char *name, size_t len) +ifc_simple_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) { char *dp; int wildcard; @@ -443,7 +443,7 @@ if (err != 0) return (err); - err = ifcs->ifcs_create(ifc, unit); + err = ifcs->ifcs_create(ifc, unit, params); if (err != 0) { ifc_free_unit(ifc, unit); return (err); ==== //depot/projects/vap/sys/net/if_clone.h#2 (text+ko) ==== @@ -61,7 +61,7 @@ /* (c) Driver specific cloning functions. Called with no locks held. */ void (*ifc_attach)(struct if_clone *); int (*ifc_match)(struct if_clone *, const char *); - int (*ifc_create)(struct if_clone *, char *, size_t); + int (*ifc_create)(struct if_clone *, char *, size_t, caddr_t); int (*ifc_destroy)(struct if_clone *, struct ifnet *); long ifc_refcnt; /* (i) Refrence count. */ @@ -72,7 +72,7 @@ void if_clone_attach(struct if_clone *); void if_clone_detach(struct if_clone *); -int if_clone_create(char *, size_t); +int if_clone_create(char *, size_t, caddr_t); int if_clone_destroy(const char *); int if_clone_list(struct if_clonereq *); @@ -88,7 +88,7 @@ struct ifc_simple_data { int ifcs_minifs; /* minimum number of interfaces */ - int (*ifcs_create)(struct if_clone *, int); + int (*ifcs_create)(struct if_clone *, int, caddr_t); void (*ifcs_destroy)(struct ifnet *); }; @@ -105,7 +105,7 @@ void ifc_simple_attach(struct if_clone *); int ifc_simple_match(struct if_clone *, const char *); -int ifc_simple_create(struct if_clone *, char *, size_t); +int ifc_simple_create(struct if_clone *, char *, size_t, caddr_t); int ifc_simple_destroy(struct if_clone *, struct ifnet *); #endif /* _KERNEL */ ==== //depot/projects/vap/sys/net/if_disc.c#2 (text+ko) ==== @@ -70,7 +70,7 @@ struct sockaddr *, struct rtentry *); static void discrtrequest(int, struct rtentry *, struct rt_addrinfo *); static int discioctl(struct ifnet *, u_long, caddr_t); -static int disc_clone_create(struct if_clone *, int); +static int disc_clone_create(struct if_clone *, int, caddr_t); static void disc_clone_destroy(struct ifnet *); static struct mtx disc_mtx; @@ -80,7 +80,7 @@ IFC_SIMPLE_DECLARE(disc, 0); static int -disc_clone_create(struct if_clone *ifc, int unit) +disc_clone_create(struct if_clone *ifc, int unit, caddr_t params) { struct ifnet *ifp; struct disc_softc *sc; ==== //depot/projects/vap/sys/net/if_faith.c#2 (text+ko) ==== @@ -101,7 +101,7 @@ static MALLOC_DEFINE(M_FAITH, FAITHNAME, "Firewall Assisted Tunnel Interface"); static LIST_HEAD(, faith_softc) faith_softc_list; -static int faith_clone_create(struct if_clone *, int); +static int faith_clone_create(struct if_clone *, int, caddr_t); static void faith_clone_destroy(struct ifnet *); static void faith_destroy(struct faith_softc *); @@ -161,9 +161,10 @@ MODULE_VERSION(if_faith, 1); static int -faith_clone_create(ifc, unit) +faith_clone_create(ifc, unit, params) struct if_clone *ifc; int unit; + caddr_t params; { struct faith_softc *sc; ==== //depot/projects/vap/sys/net/if_gif.c#2 (text+ko) ==== @@ -98,7 +98,7 @@ void (*ng_gif_attach_p)(struct ifnet *ifp); void (*ng_gif_detach_p)(struct ifnet *ifp); -static int gif_clone_create(struct if_clone *, int); +static int gif_clone_create(struct if_clone *, int, caddr_t); static void gif_clone_destroy(struct ifnet *); IFC_SIMPLE_DECLARE(gif, 0); @@ -137,9 +137,10 @@ ¶llel_tunnels, 0, "Allow parallel tunnels?"); static int -gif_clone_create(ifc, unit) +gif_clone_create(ifc, unit, params) struct if_clone *ifc; int unit; + caddr_t params; { struct gif_softc *sc; ==== //depot/projects/vap/sys/net/if_gre.c#2 (text+ko) ==== @@ -102,7 +102,7 @@ struct gre_softc_head gre_softc_list; -static int gre_clone_create(struct if_clone *, int); +static int gre_clone_create(struct if_clone *, int, caddr_t); static void gre_clone_destroy(struct ifnet *); static int gre_ioctl(struct ifnet *, u_long, caddr_t); static int gre_output(struct ifnet *, struct mbuf *, struct sockaddr *, @@ -161,9 +161,10 @@ } static int -gre_clone_create(ifc, unit) +gre_clone_create(ifc, unit, params) struct if_clone *ifc; int unit; + caddr_t params; { struct gre_softc *sc; ==== //depot/projects/vap/sys/net/if_loop.c#2 (text+ko) ==== @@ -101,7 +101,7 @@ static void lortrequest(int, struct rtentry *, struct rt_addrinfo *); int looutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct rtentry *rt); -static int lo_clone_create(struct if_clone *, int); +static int lo_clone_create(struct if_clone *, int, caddr_t); static void lo_clone_destroy(struct ifnet *); struct ifnet *loif = NULL; /* Used externally */ @@ -133,9 +133,10 @@ } static int -lo_clone_create(ifc, unit) +lo_clone_create(ifc, unit, params) struct if_clone *ifc; int unit; + caddr_t params; { struct lo_softc *sc; ==== //depot/projects/vap/sys/net/if_ppp.c#2 (text+ko) ==== @@ -157,7 +157,7 @@ static void ppp_ccp_closed(struct ppp_softc *); static void ppp_inproc(struct ppp_softc *, struct mbuf *); static void pppdumpm(struct mbuf *m0); -static int ppp_clone_create(struct if_clone *, int); +static int ppp_clone_create(struct if_clone *, int, caddr_t); static void ppp_clone_destroy(struct ifnet *); struct ppp_softc * @@ -221,7 +221,7 @@ #endif /* PPP_COMPRESS */ static int -ppp_clone_create(struct if_clone *ifc, int unit) +ppp_clone_create(struct if_clone *ifc, int unit, caddr_t params) { struct ppp_softc *sc; @@ -354,7 +354,7 @@ /* Try to clone an interface if we don't have a free one */ if (sc == NULL) { strcpy(tmpname, PPPNAME); - if (if_clone_create(tmpname, sizeof(tmpname)) != 0) + if (if_clone_create(tmpname, sizeof(tmpname), (caddr_t) 0) != 0) return NULL; ifp = ifunit(tmpname); if (ifp == NULL) ==== //depot/projects/vap/sys/net/if_stf.c#2 (text+ko) ==== @@ -178,7 +178,7 @@ static int stf_ioctl(struct ifnet *, u_long, caddr_t); static int stf_clone_match(struct if_clone *, const char *); -static int stf_clone_create(struct if_clone *, char *, size_t); +static int stf_clone_create(struct if_clone *, char *, size_t, caddr_t); static int stf_clone_destroy(struct if_clone *, struct ifnet *); struct if_clone stf_cloner = IFC_CLONE_INITIALIZER(STFNAME, NULL, 0, NULL, stf_clone_match, stf_clone_create, stf_clone_destroy); @@ -197,7 +197,7 @@ } static int -stf_clone_create(struct if_clone *ifc, char *name, size_t len) +stf_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) { int err, unit; struct stf_softc *sc; ==== //depot/projects/vap/sys/net/if_vlan.c#2 (text+ko) ==== @@ -131,7 +131,7 @@ static struct ifnet *vlan_clone_match_ethertag(struct if_clone *, const char *, int *); static int vlan_clone_match(struct if_clone *, const char *); -static int vlan_clone_create(struct if_clone *, char *, size_t); +static int vlan_clone_create(struct if_clone *, char *, size_t, caddr_t); static int vlan_clone_destroy(struct if_clone *, struct ifnet *); struct if_clone vlan_cloner = IFC_CLONE_INITIALIZER(VLANNAME, NULL, IF_MAXUNIT, @@ -313,7 +313,7 @@ } static int -vlan_clone_create(struct if_clone *ifc, char *name, size_t len) +vlan_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) { char *dp; int wildcard; @@ -324,8 +324,37 @@ struct ifvlan *ifv; struct ifnet *ifp; struct ifnet *p; + struct vlanreq vlr; - if ((p = vlan_clone_match_ethertag(ifc, name, &tag)) != NULL) { + /* + * There are 3 (ugh) ways to specify the cloned device: + * o pass a parameter block with the clone request. + * o specify parameters in the text of the clone device name + * o specify no parameters and get an unattached device that + * must be configured separately. + * The first technique is preferred; the latter two are + * supported for backwards compatibilty. + */ + if (params) { + error = copyin(params, &vlr, sizeof(vlr)); + if (error) + return error; + p = ifunit(vlr.vlr_parent); + if (p == NULL) + return ENXIO; + /* + * Don't let the caller set up a VLAN tag with + * anything except VLID bits. + */ + if (vlr.vlr_tag & ~EVL_VLID_MASK) + return (EINVAL); + error = ifc_name2unit(name, &unit); + if (error != 0) + return (error); + + tag = vlr.vlr_tag; + wildcard = (unit < 0); + } else if ((p = vlan_clone_match_ethertag(ifc, name, &tag)) != NULL) { ethertag = 1; unit = -1; wildcard = 0; ==== //depot/projects/wifi/sbin/ifconfig/ifclone.c#6 (text+ko) ==== @@ -88,48 +88,62 @@ free(buf); } +static clone_callback_func *clone_cb = NULL; + void -clone_create(void) +clone_setcallback(clone_callback_func *p) { - int s; + if (clone_cb != NULL && clone_cb != p) + errx(1, "conflicting device create parameters"); + clone_cb = p; +} - s = socket(AF_INET, SOCK_DGRAM, 0); - if (s == -1) - err(1, "socket(AF_INET,SOCK_DGRAM)"); +/* + * Do the actual clone operation. Any parameters must have been + * setup by now. If a callback has been setup to do the work + * then defer to it; otherwise do a simple create operation with + * no parameters. + */ +static void +ifclonecreate(int s, void *arg) +{ + struct ifreq ifr; memset(&ifr, 0, sizeof(ifr)); (void) strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); - if (ioctl(s, SIOCIFCREATE, &ifr) < 0) - err(1, "SIOCIFCREATE"); + if (clone_cb == NULL) { + /* NB: no parameters */ + if (ioctl(s, SIOCIFCREATE, &ifr) < 0) + err(1, "SIOCIFCREATE"); + } else { + clone_cb(s, &ifr); + } /* - * If we get a different name back then we put in, we probably - * want to print it out, but we might change our mind later so - * we just signal our intrest and leave the printout for later. + * If we get a different name back than we put in, print it. */ - if (strcmp(name, ifr.ifr_name) != 0) { - printname = 1; + if (strncmp(name, ifr.ifr_name, sizeof(name)) != 0) { strlcpy(name, ifr.ifr_name, sizeof(name)); + printf("%s\n", name); } +} - close(s); +static +DECL_CMD_FUNC(clone_create, arg, d) +{ + callback_register(ifclonecreate, NULL); } -static void -clone_destroy(const char *val, int d, int s, const struct afswtch *rafp) +static +DECL_CMD_FUNC(clone_destroy, arg, d) { - (void) strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); if (ioctl(s, SIOCIFDESTROY, &ifr) < 0) err(1, "SIOCIFDESTROY"); - /* - * If we create and destroy an interface in the same command, - * there isn't any reason to print it's name. - */ - printname = 0; } static struct cmd clone_cmds[] = { + DEF_CMD("create", 0, clone_create), DEF_CMD("destroy", 0, clone_destroy), DEF_CMD("unplumb", 0, clone_destroy), }; ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.c#11 (text+ko) ==== @@ -91,7 +91,6 @@ int verbose; int supmedia = 0; -int printname = 0; /* Print the name of the created interface. */ static int ifconfig(int argc, char *const *argv, const struct afswtch *afp); static void status(const struct afswtch *afp, int addrcount, @@ -233,16 +232,14 @@ ifindex = if_nametoindex(name); if (ifindex == 0) { /* - * NOTE: We must special-case the `create' command right - * here as we would otherwise fail when trying to find - * the interface. + * NOTE: We must special-case the `create' command + * right here as we would otherwise fail when trying + * to find the interface. */ if (argc > 0 && (strcmp(argv[0], "create") == 0 || strcmp(argv[0], "plumb") == 0)) { - clone_create(); - argc--, argv++; - if (argc == 0) - goto end; + ifconfig(argc, argv, NULL); + exit(0); } errx(1, "interface %s does not exist", name); } @@ -353,9 +350,6 @@ if (namesonly && need_nl > 0) putchar('\n'); -end: - if (printname) - printf("%s\n", name); exit (0); } @@ -780,12 +774,6 @@ } strlcpy(name, newname, sizeof(name)); free(newname); - - /* - * Even if we just created the interface, we don't need to print - * its name because we just nailed it down separately. - */ - printname = 0; } /* ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.h#9 (text+ko) ==== @@ -126,7 +126,6 @@ extern char name[IFNAMSIZ]; /* name of interface */ extern int allmedia; extern int supmedia; -extern int printname; extern int flags; extern int newaddr; extern int verbose; @@ -139,4 +138,5 @@ void ifmaybeload(char *name); -void clone_create(void); +typedef void clone_callback_func(int, struct ifreq *); +void clone_setcallback(clone_callback_func *); ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#37 (text+ko) ==== @@ -1120,56 +1120,49 @@ #undef iseq } +static struct ieee80211_clone_params params = { + .icp_opmode = IEEE80211_M_STA, /* default to station mode */ +}; + +static void +wlan_create(int s, struct ifreq *ifr) +{ + if (params.icp_parent[0] == '\0') + errx(1, "must specify a parent when creating a wlan device"); + ifr->ifr_data = (caddr_t) ¶ms; + if (ioctl(s, SIOCIFCREATE, ifr) < 0) + err(1, "SIOCIFCREATE"); +} + static -DECL_CMD_FUNC(set80211create, arg, d) +DECL_CMD_FUNC(set80211wlandev, arg, d) +{ + strlcpy(params.icp_parent, arg, IFNAMSIZ); + clone_setcallback(wlan_create); +} + +static +DECL_CMD_FUNC(set80211wlantype, arg, d) { #define iseq(a,b) (strncasecmp(a,b,sizeof(b)-1) == 0) - struct ifreq ifr; - int opmode; - if (iseq(arg, "sta")) - opmode = IEEE80211_M_STA; + params.icp_opmode = IEEE80211_M_STA; else if (iseq(arg, "ahdemo") || iseq(arg, "adhoc-demo")) - opmode = IEEE80211_M_AHDEMO; + params.icp_opmode = IEEE80211_M_AHDEMO; else if (iseq(arg, "ibss") || iseq(arg, "adhoc")) - opmode = IEEE80211_M_IBSS; + params.icp_opmode = IEEE80211_M_IBSS; else if (iseq(arg, "ap") || iseq(arg, "hostap")) - opmode = IEEE80211_M_HOSTAP; + params.icp_opmode = IEEE80211_M_HOSTAP; else if (iseq(arg, "wds")) - opmode = IEEE80211_M_WDS; + params.icp_opmode = IEEE80211_M_WDS; else if (iseq(arg, "monitor")) - opmode = IEEE80211_M_MONITOR; + params.icp_opmode = IEEE80211_M_MONITOR; else errx(1, "Don't know how to create %s for %s", arg, name); - - (void) memset(&ifr, 0, sizeof(ifr)); - (void) strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); - ifr.ifr_flags = opmode; - if (ioctl(s, SIOC80211IFCREATE, &ifr) < 0) - err(1, "SIOC80211IFCREATE"); - /* - * If we get a different name back then we put in, we probably - * want to print it out, but we might change our mind later so - * we just signal our interest and leave the printout for later. - */ - if (strcmp(name, ifr.ifr_name) != 0) { - printname = 1; - strlcpy(name, ifr.ifr_name, sizeof(name)); - } + clone_setcallback(wlan_create); #undef iseq } -static -DECL_CMD_FUNC(set80211destroy, arg, d) -{ - struct ifreq req; - - (void) memset(&req, 0, sizeof(req)); - (void) strncpy(req.ifr_name, name, sizeof(req.ifr_name)); - if (ioctl(s, SIOC80211IFDESTROY, &req) < 0) - err(1, "SIOC80211IFDESTROY"); -} - static enum ieee80211_opmode get80211opmode(int s) { @@ -1870,8 +1863,8 @@ DEF_CMD("-ff", 0, set80211fastframes), DEF_CMD("turbo", 1, set80211turbo), DEF_CMD("-turbo", 0, set80211turbo), - DEF_CMD_ARG("create", set80211create), - DEF_CMD("kill", 0, set80211destroy), /*XXX*/ + DEF_CMD_ARG("wlandev", set80211wlandev), + DEF_CMD_ARG("wlantype", set80211wlantype), }; static struct afswtch af_ieee80211 = { .af_name = "af_ieee80211", ==== //depot/projects/wifi/sbin/ifconfig/ifvlan.c#8 (text+ko) ==== @@ -58,8 +58,12 @@ static const char rcsid[] = "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.7 2004/12/31 19:46:27 sam Exp $"; #endif -static int __tag = 0; -static int __have_tag = 0; + +#define NOTAG ((u_short) -1) + +static struct vlanreq params = { + .vlr_tag = NOTAG, +}; static void vlan_status(int s) @@ -75,58 +79,66 @@ printf("\tvlan: %d parent interface: %s\n", vreq.vlr_tag, vreq.vlr_parent[0] == '\0' ? "" : vreq.vlr_parent); +} - return; +static void +vlan_create(int s, struct ifreq *ifr) +{ + if (params.vlr_tag != NOTAG || params.vlr_parent[0] != '\0') { + /* + * One or both parameters were specified, make sure both. + */ + if (params.vlr_tag == NOTAG) + errx(1, "must specify a tag for vlan create"); + if (params.vlr_parent[0] == '\0') + errx(1, "must specify a parent device for vlan create"); + ifr->ifr_data = (caddr_t) ¶ms; + } + if (ioctl(s, SIOCIFCREATE, ifr) < 0) + err(1, "SIOCIFCREATE"); } -static void -setvlantag(const char *val, int d, int s, const struct afswtch *afp) +static +DECL_CMD_FUNC(setvlantag, val, d) { u_int16_t tag; struct vlanreq vreq; - __tag = tag = atoi(val); - __have_tag = 1; + tag = (u_int16_t) atoi(val); bzero((char *)&vreq, sizeof(struct vlanreq)); ifr.ifr_data = (caddr_t)&vreq; - if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1) - err(1, "SIOCGETVLAN"); - - vreq.vlr_tag = tag; - - if (ioctl(s, SIOCSETVLAN, (caddr_t)&ifr) == -1) - err(1, "SIOCSETVLAN"); - - return; + if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) != -1) { + vreq.vlr_tag = tag; + if (ioctl(s, SIOCSETVLAN, (caddr_t)&ifr) == -1) + err(1, "SIOCSETVLAN"); + } else { + params.vlr_tag = tag; + clone_setcallback(vlan_create); + } } -static void -setvlandev(const char *val, int d, int s, const struct afswtch *afp) +static +DECL_CMD_FUNC(setvlandev, val, d) { struct vlanreq vreq; - if (!__have_tag) - errx(1, "must specify both vlan tag and device"); - bzero((char *)&vreq, sizeof(struct vlanreq)); ifr.ifr_data = (caddr_t)&vreq; - if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1) - err(1, "SIOCGETVLAN"); - - strncpy(vreq.vlr_parent, val, sizeof(vreq.vlr_parent)); - vreq.vlr_tag = __tag; - - if (ioctl(s, SIOCSETVLAN, (caddr_t)&ifr) == -1) - err(1, "SIOCSETVLAN"); - - return; + if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) != -1) { + strncpy(vreq.vlr_parent, val, sizeof(vreq.vlr_parent)); + if (ioctl(s, SIOCSETVLAN, (caddr_t)&ifr) == -1) + err(1, "SIOCSETVLAN"); + } else { + strlcpy(params.vlr_parent, val, sizeof(params.vlr_parent)); + clone_setcallback(vlan_create); + } } -static void -unsetvlandev(const char *val, int d, int s, const struct afswtch *afp) +static +DECL_CMD_FUNC(unsetvlandev, val, d) { struct vlanreq vreq; @@ -141,8 +153,6 @@ if (ioctl(s, SIOCSETVLAN, (caddr_t)&ifr) == -1) err(1, "SIOCSETVLAN"); - - return; } static struct cmd vlan_cmds[] = { From owner-p4-projects@FreeBSD.ORG Mon Feb 7 17:42:53 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4ECD116A4D0; Mon, 7 Feb 2005 17:42:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2835A16A4CE for ; Mon, 7 Feb 2005 17:42:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D97D243D5A for ; Mon, 7 Feb 2005 17:42:52 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17Hgqhu028317 for ; Mon, 7 Feb 2005 17:42:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17Hgqcp028314 for perforce@freebsd.org; Mon, 7 Feb 2005 17:42:52 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Feb 2005 17:42:52 GMT Message-Id: <200502071742.j17Hgqcp028314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 70524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 17:42:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=70524 Change 70524 by sam@sam_ebb on 2005/02/07 17:42:03 use revised cloning support to create/destroy virtual ap's instead of using private support; update drivers for revised api's Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#5 edit .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#3 edit .. //depot/projects/vap/sys/dev/wi/if_wi.c#3 edit .. //depot/projects/vap/sys/net80211/ieee80211.c#4 edit .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#3 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#4 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#3 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#6 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#5 (text+ko) ==== @@ -99,7 +99,8 @@ ATH_LED_POLL, }; -static struct ieee80211vap *ath_vap_create(struct ieee80211com *, int opmode); +static struct ieee80211vap *ath_vap_create(struct ieee80211com *, + const char name[IFNAMSIZ], int unit, int opmode); static void ath_vap_delete(struct ieee80211vap *); static void ath_init(void *); static void ath_stop_locked(struct ifnet *); @@ -633,7 +634,8 @@ } static struct ieee80211vap * -ath_vap_create(struct ieee80211com *ic, int opmode) +ath_vap_create(struct ieee80211com *ic, + const char name[IFNAMSIZ], int unit, int opmode) { struct ath_softc *sc = ic->ic_ifp->if_softc; struct ieee80211vap *vap; @@ -683,7 +685,7 @@ /* XXX msg */ return NULL; } - ieee80211_vap_setup(ic, vap, opmode); + ieee80211_vap_setup(ic, vap, name, unit, opmode); /* override with driver methods */ sc->sc_newstate = vap->iv_newstate; /* XXX per-vap */ vap->iv_newstate = ath_newstate; @@ -4817,18 +4819,6 @@ case SIOCSIFMEDIA: error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); break; - case SIOC80211IFCREATE: - error = suser(curthread); - if (error == 0) { - struct ieee80211vap *vap = - ic->ic_vap_create(ic, ifr->ifr_flags); - if (vap != NULL) - strlcpy(ifr->ifr_name, - vap->iv_if.if_xname, IFNAMSIZ); - else - error = EOPNOTSUPP; /* XXX */ - } - break; default: error = EINVAL; break; ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#3 (text+ko) ==== @@ -111,7 +111,8 @@ static const struct ieee80211_rateset iwi_rateset_11g = { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } }; -static struct ieee80211vap *iwi_vap_create(struct ieee80211com *, int opmode); +static struct ieee80211vap *iwi_vap_create(struct ieee80211com *, + const char name[IFNAMSIZ], int unit, int opmode); static void iwi_vap_delete(struct ieee80211vap *); static int iwi_dma_alloc(struct iwi_softc *); static void iwi_release(struct iwi_softc *); @@ -363,9 +364,6 @@ if (bootverbose) ieee80211_announce(ic); - /* create an initial station mode instance */ - (void) ic->ic_vap_create(ic, IEEE80211_M_STA); - return 0; fail: iwi_detach(dev); @@ -408,7 +406,8 @@ } static struct ieee80211vap * -iwi_vap_create(struct ieee80211com *ic, int opmode) +iwi_vap_create(struct ieee80211com *ic, + const char name[IFNAMSIZ], int unit, int opmode) { struct ieee80211vap *vap; @@ -434,7 +433,7 @@ /* XXX msg */ return NULL; } - ieee80211_vap_setup(ic, vap, opmode); + ieee80211_vap_setup(ic, vap, name, unit, opmode); /* override with driver methods */ vap->iv_newstate = iwi_newstate; ==== //depot/projects/vap/sys/dev/wi/if_wi.c#3 (text+ko) ==== @@ -114,7 +114,8 @@ #include #include -static struct ieee80211vap *wi_vap_create(struct ieee80211com *, int opmode); +static struct ieee80211vap *wi_vap_create(struct ieee80211com *, + const char name[IFNAMSIZ], int unit, int opmode); static void wi_vap_delete(struct ieee80211vap *); static void wi_start(struct ifnet *); @@ -502,9 +503,6 @@ if (bootverbose) ieee80211_announce(ic); - /* create an initial station mode instance */ - (void) ic->ic_vap_create(ic, IEEE80211_M_STA); - return (0); } @@ -536,7 +534,8 @@ } static struct ieee80211vap * -wi_vap_create(struct ieee80211com *ic, int opmode) +wi_vap_create(struct ieee80211com *ic, + const char name[IFNAMSIZ], int unit, int opmode) { struct wi_softc *sc = ic->ic_ifp->if_softc; struct ieee80211vap *vap; @@ -563,7 +562,7 @@ /* XXX msg */ return NULL; } - ieee80211_vap_setup(ic, vap, opmode); + ieee80211_vap_setup(ic, vap, name, unit, opmode); vap->iv_max_aid = WI_MAX_AID; /* XXX */ /* override with driver methods */ sc->sc_newstate = vap->iv_newstate; /* XXX per-vap */ ==== //depot/projects/vap/sys/net80211/ieee80211.c#4 (text+ko) ==== @@ -192,12 +192,13 @@ } int -ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, int opmode) +ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, + const char name[IFNAMSIZ], int unit, int opmode) { struct ifnet *ifp; ifp = &vap->iv_if; - if_initname(ifp, "wlan", ieee80211_alloc_wlanunit()); + if_initname(ifp, name, unit); ifp->if_softc = vap; /* back pointer */ ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST; ifp->if_start = ieee80211_start; @@ -292,8 +293,8 @@ struct ieee80211com *ic = vap->iv_ic; struct ifnet *ifp = &vap->iv_if; + bpfdetach(ifp); ether_ifdetach(ifp); - bpfdetach(ifp); IEEE80211_LOCK(ic); TAILQ_REMOVE(&ic->ic_vaps, vap, iv_next); @@ -303,8 +304,6 @@ ifmedia_removeall(&vap->iv_media); - ieee80211_delete_wlanunit(ifp->if_dunit); - ieee80211_sysctl_vdetach(vap); ieee80211_proto_vdetach(vap); ieee80211_crypto_vdetach(vap); ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#3 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -323,42 +324,39 @@ #endif } -static struct mtx ieee80211_unit_mtx; -static u_int8_t wlan_units[32]; /* enough for 256 */ +static void +wlan_clone_destroy(struct ifnet *ifp) +{ + struct ieee80211vap *vap = ifp->if_softc; + struct ieee80211com *ic = vap->iv_ic; + + ic->ic_vap_delete(vap); +} -u_int -ieee80211_alloc_wlanunit(void) +static int +wlan_clone_create(struct if_clone *ifc, int unit, caddr_t params) { -#define N(a) (sizeof(a)/sizeof(a[0])) - u_int unit; - u_int8_t b; - int i; + struct ieee80211_clone_params cp; + struct ieee80211vap *vap; + struct ieee80211com *ic; + struct ifnet *ifp; + int error; - mtx_lock(&ieee80211_unit_mtx); - unit = 0; - for (i = 0; i < N(wlan_units) && wlan_units[i] == 0xff; i++) - unit += NBBY; - if (i == N(wlan_units)) - panic("vap table full"); - for (b = wlan_units[i]; b & 1; b >>= 1) - unit++; - setbit(wlan_units, unit); - mtx_unlock(&ieee80211_unit_mtx); + error = copyin(params, &cp, sizeof(cp)); + if (error) + return error; + ifp = ifunit(cp.icp_name); + if (ifp == NULL) + return ENXIO; + ic = ifp->if_softc; /* XXX */ + vap = ic->ic_vap_create(ic, ifc->ifc_name, unit, cp.icp_opmode); + if (vap == NULL) + return EIO; - return unit; -#undef N + return 0; } +IFC_SIMPLE_DECLARE(wlan, 0); -void -ieee80211_delete_wlanunit(u_int unit) -{ - mtx_lock(&ieee80211_unit_mtx); - KASSERT(unit < sizeof(wlan_units)*NBBY, ("invalid wlan unit %u", unit)); - KASSERT(isset(wlan_units, unit), ("wlan unit %u not allocated", unit)); - clrbit(wlan_units, unit); - mtx_unlock(&ieee80211_unit_mtx); -} - /* * Module glue. * @@ -371,11 +369,10 @@ case MOD_LOAD: if (bootverbose) printf("wlan: <802.11 Link Layer>\n"); - mtx_init(&ieee80211_unit_mtx, "wlan_unit", - "wlan unit numbers", MTX_DEF); + if_clone_attach(&wlan_cloner); return 0; case MOD_UNLOAD: - mtx_destroy(&ieee80211_unit_mtx); + if_clone_detach(&wlan_cloner); return 0; } return EINVAL; ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#4 (text+ko) ==== @@ -2401,11 +2401,6 @@ (struct ieee80211req *) data); } break; - case SIOC80211IFDESTROY: - error = suser(curthread); - if (error == 0) - ic->ic_vap_delete(vap); - break; case SIOCGIFGENERIC: error = ieee80211_cfgget(ifp, cmd, data); break; ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#3 (text+ko) ==== @@ -361,8 +361,6 @@ #define SIOCS80211 _IOW('i', 234, struct ieee80211req) #define SIOCG80211 _IOWR('i', 235, struct ieee80211req) #define SIOCG80211STATS _IOWR('i', 236, struct ifreq) -#define SIOC80211IFCREATE _IOWR('i', 237, struct ifreq) -#define SIOC80211IFDESTROY _IOW('i', 238, struct ifreq) #define IEEE80211_IOC_SSID 1 #define IEEE80211_IOC_NUMSSIDS 2 @@ -456,6 +454,10 @@ /* variable length SSID followed by IE data */ }; +struct ieee80211_clone_params { + char icp_parent[IFNAMSIZ]; /* parent device */ + int icp_opmode; /* operating mode */ +}; #endif /* __FreeBSD__ */ #endif /* _NET80211_IEEE80211_IOCTL_H_ */ ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#6 (text+ko) ==== @@ -139,6 +139,7 @@ /* virtual ap create/delete */ struct ieee80211vap *(*ic_vap_create)(struct ieee80211com *, + const char name[IFNAMSIZ], int unit, int opmode); void (*ic_vap_delete)(struct ieee80211vap *); /* send/recv 802.11 management frame */ @@ -297,7 +298,7 @@ void ieee80211_ifattach(struct ieee80211com *); void ieee80211_ifdetach(struct ieee80211com *); int ieee80211_vap_setup(struct ieee80211com *, struct ieee80211vap *, - int opmode); + const char name[IFNAMSIZ], int unit, int opmode); int ieee80211_vap_attach(struct ieee80211vap *, ifm_change_cb_t, ifm_stat_cb_t); void ieee80211_vap_detach(struct ieee80211vap *); From owner-p4-projects@FreeBSD.ORG Mon Feb 7 18:21:42 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2080916A4D0; Mon, 7 Feb 2005 18:21:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EDDA416A4CE for ; Mon, 7 Feb 2005 18:21:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2D8443D2F for ; Mon, 7 Feb 2005 18:21:41 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17ILffH031457 for ; Mon, 7 Feb 2005 18:21:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17ILfwW031454 for perforce@freebsd.org; Mon, 7 Feb 2005 18:21:41 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Feb 2005 18:21:41 GMT Message-Id: <200502071821.j17ILfwW031454@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 70529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 18:21:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=70529 Change 70529 by sam@sam_ebb on 2005/02/07 18:20:55 typo Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#5 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#5 (text+ko) ==== @@ -138,7 +138,7 @@ if (ic->ic_lintval == 0) ic->ic_lintval = IEEE80211_BINTVAL_DEFAULT; ic->ic_bmisstimeout = 7*ic->ic_lintval; /* default 7 beacons */ - IEEE80211_LOCK_INIT(ic, "iee80211com"); + IEEE80211_LOCK_INIT(ic, "ieee80211com"); TAILQ_INIT(&ic->ic_vaps); ic->ic_txpowlimit = IEEE80211_TXPOWER_MAX; From owner-p4-projects@FreeBSD.ORG Mon Feb 7 18:21:43 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 132B516A4DE; Mon, 7 Feb 2005 18:21:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30DE616A4D7 for ; Mon, 7 Feb 2005 18:21:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19EB743D2F for ; Mon, 7 Feb 2005 18:21:42 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17ILfLa031463 for ; Mon, 7 Feb 2005 18:21:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17ILfx7031460 for perforce@freebsd.org; Mon, 7 Feb 2005 18:21:41 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Feb 2005 18:21:41 GMT Message-Id: <200502071821.j17ILfx7031460@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 70530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 18:21:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=70530 Change 70530 by sam@sam_ebb on 2005/02/07 18:21:08 correct mis-merge Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_input.c#4 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_input.c#4 (text+ko) ==== @@ -2253,6 +2253,14 @@ IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); IEEE80211_VERIFY_SSID(vap->iv_bss, ssid); + if ((ic->ic_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) { + IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, + wh, ieee80211_mgt_subtype_name[subtype >> + IEEE80211_FC0_SUBTYPE_SHIFT], + "%s", "no ssid with ssid suppression enabled"); + ic->ic_stats.is_rx_ssidmismatch++; /*XXX*/ + return; + } if (ni == vap->iv_bss) { if (vap->iv_opmode == IEEE80211_M_IBSS) { From owner-p4-projects@FreeBSD.ORG Mon Feb 7 18:23:45 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D01016A4EE; Mon, 7 Feb 2005 18:23:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 291B616A4D8 for ; Mon, 7 Feb 2005 18:23:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FD4643D3F for ; Mon, 7 Feb 2005 18:23:45 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17INiud031568 for ; Mon, 7 Feb 2005 18:23:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17INi0w031565 for perforce@freebsd.org; Mon, 7 Feb 2005 18:23:44 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Feb 2005 18:23:44 GMT Message-Id: <200502071823.j17INi0w031565@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 70531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 18:23:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=70531 Change 70531 by jhb@jhb_slimer on 2005/02/07 18:23:15 IFC this file. Affected files ... .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#82 integrate Differences ... ==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#82 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.368 2005/01/25 00:39:00 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.370 2005/02/02 17:17:15 jeff Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -2082,7 +2082,7 @@ NDINIT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | NOOBJ | MPSAFE, UIO_USERSPACE, uap->path, td); #else - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | NOOBJ, UIO_USERSPACE | MPSAFE, + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | NOOBJ | MPSAFE, UIO_USERSPACE, uap->path, td); #endif if ((error = namei(&nd)) != 0) @@ -3266,7 +3266,7 @@ vrele(fvp); goto out1; } - tvfslocked = NDHASGIANT(&fromnd); + tvfslocked = NDHASGIANT(&tond); tdvp = tond.ni_dvp; tvp = tond.ni_vp; if (tvp != NULL) { From owner-p4-projects@FreeBSD.ORG Mon Feb 7 19:51:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 490F716A4D0; Mon, 7 Feb 2005 19:51:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2280316A4CE for ; Mon, 7 Feb 2005 19:51:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70F7A43D39 for ; Mon, 7 Feb 2005 19:51:35 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17JpZdN034904 for ; Mon, 7 Feb 2005 19:51:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17JpYeW034901 for perforce@freebsd.org; Mon, 7 Feb 2005 19:51:34 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Feb 2005 19:51:34 GMT Message-Id: <200502071951.j17JpYeW034901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 70540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 19:51:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=70540 Change 70540 by jhb@jhb_slimer on 2005/02/07 19:51:24 IFC @70538. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#77 integrate .. //depot/projects/smpng/sys/alpha/include/cpuconf.h#4 integrate .. //depot/projects/smpng/sys/alpha/isa/isa_dma.c#8 integrate .. //depot/projects/smpng/sys/alpha/pci/lca.c#7 integrate .. //depot/projects/smpng/sys/alpha/pci/lcareg.h#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/legacy.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#35 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#41 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#11 integrate .. //depot/projects/smpng/sys/amd64/isa/isa_dma.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#9 integrate .. //depot/projects/smpng/sys/arm/include/cpu.h#4 integrate .. //depot/projects/smpng/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/smpng/sys/coda/coda_vnops.c#21 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#19 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#53 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#22 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.c#13 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#26 integrate .. //depot/projects/smpng/sys/conf/NOTES#92 integrate .. //depot/projects/smpng/sys/conf/files#135 integrate .. //depot/projects/smpng/sys/conf/files.i386#75 integrate .. //depot/projects/smpng/sys/conf/files.pc98#70 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#42 integrate .. //depot/projects/smpng/sys/conf/options#93 integrate .. //depot/projects/smpng/sys/conf/options.pc98#44 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr_isa.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr_pci.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltrvar.h#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi.c#78 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#30 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_package.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_perf.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_throttle.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#51 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#66 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#23 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#23 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.h#8 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbusvar.h#9 integrate .. //depot/projects/smpng/sys/dev/cpufreq/ichss.c#1 branch .. //depot/projects/smpng/sys/dev/em/if_em.c#44 integrate .. //depot/projects/smpng/sys/dev/fe/mb86960.h#1 branch .. //depot/projects/smpng/sys/dev/hme/if_hme.c#21 integrate .. //depot/projects/smpng/sys/dev/ic/i8237.h#2 integrate .. //depot/projects/smpng/sys/dev/ieee488/ibfoo_int.h#1 branch .. //depot/projects/smpng/sys/dev/ieee488/pcii.c#1 branch .. //depot/projects/smpng/sys/dev/ieee488/ugpib.h#1 branch .. //depot/projects/smpng/sys/dev/ieee488/upd7210.c#1 branch .. //depot/projects/smpng/sys/dev/ieee488/upd7210.h#1 branch .. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#16 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/owi/if_owi_pccard.c#4 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#42 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#51 integrate .. //depot/projects/smpng/sys/dev/random/probe.c#2 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#18 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#52 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#24 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#14 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/hid.c#9 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#18 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#32 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#24 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#24 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#9 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#95 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#11 integrate .. //depot/projects/smpng/sys/i386/i386/legacy.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#88 integrate .. //depot/projects/smpng/sys/i386/i386/p4tcc.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#81 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#37 integrate .. //depot/projects/smpng/sys/i386/isa/isa_dma.c#10 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#29 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#43 integrate .. //depot/projects/smpng/sys/ia64/conf/NOTES#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#90 integrate .. //depot/projects/smpng/sys/ia64/isa/isa_dma.c#7 integrate .. //depot/projects/smpng/sys/isa/isavar.h#8 integrate .. //depot/projects/smpng/sys/kern/cpufreq_if.m#1 branch .. //depot/projects/smpng/sys/kern/kern_cpu.c#1 branch .. //depot/projects/smpng/sys/kern/kern_descrip.c#77 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#23 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#51 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#74 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#36 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#24 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#45 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#96 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#83 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#23 integrate .. //depot/projects/smpng/sys/libkern/gets.c#1 branch .. //depot/projects/smpng/sys/libkern/strlcat.c#4 integrate .. //depot/projects/smpng/sys/libkern/strlcpy.c#4 integrate .. //depot/projects/smpng/sys/modules/Makefile#90 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#25 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_perf/Makefile#1 branch .. //depot/projects/smpng/sys/modules/cpufreq/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/Makefile#19 integrate .. //depot/projects/smpng/sys/modules/netgraph/ipfw/Makefile#1 branch .. //depot/projects/smpng/sys/modules/oltr/Makefile#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#11 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#11 integrate .. //depot/projects/smpng/sys/netgraph/netflow/netflow.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.h#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#12 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.c#12 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#19 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.h#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_ipfw.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_ipfw.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_message.h#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_sample.c#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#28 integrate .. //depot/projects/smpng/sys/netgraph/ng_sppp.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_sppp.h#3 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#27 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#49 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#11 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#64 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#37 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#33 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#32 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_nfsiod.c#16 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#76 integrate .. //depot/projects/smpng/sys/pc98/pc98/isa_dma.c#8 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#50 integrate .. //depot/projects/smpng/sys/powerpc/include/atomic.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/bus.h#15 integrate .. //depot/projects/smpng/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/smpng/sys/powerpc/include/spr.h#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/clock.c#15 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/cpu.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#58 integrate .. //depot/projects/smpng/sys/sparc64/isa/isa_dma.c#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#72 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#57 integrate .. //depot/projects/smpng/sys/sys/callout.h#9 integrate .. //depot/projects/smpng/sys/sys/cpu.h#1 branch .. //depot/projects/smpng/sys/sys/file.h#22 integrate .. //depot/projects/smpng/sys/sys/kernel.h#30 integrate .. //depot/projects/smpng/sys/sys/libkern.h#16 integrate .. //depot/projects/smpng/sys/sys/param.h#77 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#16 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#33 integrate .. //depot/projects/smpng/sys/sys/systm.h#61 integrate .. //depot/projects/smpng/sys/sys/vnode.h#57 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#40 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#47 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#25 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#77 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.228 2005/01/05 20:05:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.232 2005/02/06 01:55:06 njl Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -97,60 +97,63 @@ #include "opt_maxmem.h" #include +#include #include +#include +#include +#include +#include +#include #include +#include #include #include -#include +#include #include -#include -#include -#include +#include #include +#include +#include +#include #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include +#include +#include #include -#include -#include +#include +#include + #include + #include +#include #include #include #include -#include #include #include -#include -#include + +#include +#include #include +#include +#include +#include #include -#include #include -#include -#include #include +#include #include -#include -#include +#include #include -#include + #include -#include -#include - u_int64_t cycles_per_usec; u_int32_t cycles_per_sec; int cold = 1; @@ -1718,6 +1721,14 @@ { } +/* Get current clock frequency for the given cpu id. */ +int +cpu_est_clockrate(int cpu_id, uint64_t *rate) +{ + + return (ENXIO); +} + /* * Shutdown the CPU as much as possible */ @@ -1727,10 +1738,18 @@ prom_halt(1); } +static int cpu_idle_hlt = 1; +SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, + &cpu_idle_hlt, 0, "Idle loop HLT enable"); + +/* + * call platform specific code to halt (until next interrupt) for the idle loop + */ void cpu_idle(void) { - /* Insert code to halt (until next interrupt) for the idle loop */ + if (cpu_idle_hlt && platform.cpu_idle != NULL) + platform.cpu_idle(); } /* ==== //depot/projects/smpng/sys/alpha/include/cpuconf.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpuconf.h,v 1.13 2005/01/05 20:05:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpuconf.h,v 1.14 2005/01/31 23:07:42 ticso Exp $ */ /* $NetBSD: cpuconf.h,v 1.7 1997/11/06 00:42:03 thorpej Exp $ */ #ifndef _ALPHA_CPUCONF_H #define _ALPHA_CPUCONF_H @@ -71,6 +71,7 @@ void (*clockintr)(void *); void (*mcheck_handler)(unsigned long, struct trapframe *, unsigned long, unsigned long); + void (*cpu_idle)(void); void (*pci_intr_init)(void); void (*pci_intr_map)(void *); int (*pci_intr_route)(struct device *, struct device *, int); ==== //depot/projects/smpng/sys/alpha/isa/isa_dma.c#8 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.12 2004/09/15 12:09:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.13 2005/02/06 13:46:38 phk Exp $"); #include #include @@ -60,24 +60,6 @@ #include #include -/* -** Register definitions for DMA controller 1 (channels 0..3): -*/ -#define DMA1_CHN(c) (IO_DMA1 + 1*(2*(c))) /* addr reg for channel c */ -#define DMA1_SMSK (IO_DMA1 + 1*10) /* single mask register */ -#define DMA1_MODE (IO_DMA1 + 1*11) /* mode register */ -#define DMA1_FFC (IO_DMA1 + 1*12) /* clear first/last FF */ -#define DMA1_RESET (IO_DMA1 + 1*13) /* reset */ - -/* -** Register definitions for DMA controller 2 (channels 4..7): -*/ -#define DMA2_CHN(c) (IO_DMA2 + 2*(2*(c))) /* addr reg for channel c */ -#define DMA2_SMSK (IO_DMA2 + 2*10) /* single mask register */ -#define DMA2_MODE (IO_DMA2 + 2*11) /* mode register */ -#define DMA2_FFC (IO_DMA2 + 2*12) /* clear first/last FF */ -#define DMA2_RESET (IO_DMA2 + 2*13) /* reset */ - static bus_dma_tag_t dma_tag[8]; static bus_dmamap_t dma_map[8]; static u_int8_t dma_busy = 0; /* Used in isa_dmastart() */ @@ -487,6 +469,19 @@ } /* + * Reached terminal count yet ? + */ +int +isa_dmatc(int chan) +{ + + if (chan < 4) + return(inb(DMA1_STATUS) & (1 << chan)); + else + return(inb(DMA2_STATUS) & (1 << (chan & 3))); +} + +/* * Stop a DMA transfer currently in progress. */ int ==== //depot/projects/smpng/sys/alpha/pci/lca.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/lca.c,v 1.20 2003/08/17 06:42:08 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/lca.c,v 1.21 2005/01/31 23:07:42 ticso Exp $"); #include #include @@ -35,6 +35,8 @@ #include #include #include +#include +#include #include #include @@ -222,6 +224,8 @@ lca_machine_check(unsigned long mces, struct trapframe *framep, unsigned long vector, unsigned long param); +static void lca_cpu_idle (void); + static int lca_probe(device_t dev) { @@ -234,6 +238,7 @@ lca_init_sgmap(); platform.mcheck_handler = lca_machine_check; + platform.cpu_idle = lca_cpu_idle; device_add_child(dev, "pcib", 0); @@ -270,5 +275,29 @@ REGVAL64(LCA_IOC_STAT0) = stat0; } +void +lca_cpu_idle (void) +{ + /* + * 0x0 = 1 + * 0x1 = 1.5 + * 0x2 = 2 + * 0x3 = 4 + * 0x4 = 8 + * 0x5 = 16 + */ + long override = 0x0; + long primary = 0x5; + long dma_ovr = 1; + long intr_ovr = 1; + + REGVAL64(LCA_PMR) = + (dma_ovr << 7) | (intr_ovr << 6) | (override << 3) | primary; + if (sched_runnable()) { + REGVAL64(LCA_PMR) = + (override << 3) | override; + } +} + DRIVER_MODULE(lca, root, lca_driver, lca_devclass, 0, 0); ==== //depot/projects/smpng/sys/alpha/pci/lcareg.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/pci/lcareg.h,v 1.3 2005/01/05 20:05:52 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/pci/lcareg.h,v 1.4 2005/01/31 23:07:42 ticso Exp $ */ /* $NetBSD: lcareg.h,v 1.8 1997/09/05 02:14:31 thorpej Exp $ */ /*- @@ -44,6 +44,8 @@ #define LCA_PCI_SPARSE 0x200000000L /* PCI Sparse Space */ #define LCA_PCI_DENSE 0x300000000L /* PCI Dense Space */ +#define LCA_PMR 0x120000098L /* Power Management (21066A)*/ + #define LCA_IOC_HAE LCA_IOC_BASE /* Host Address Ext. (64) */ #define IOC_HAE_ADDREXT 0x00000000f8000000UL #define IOC_HAE_RSVSD 0xffffffff07ffffffUL ==== //depot/projects/smpng/sys/amd64/amd64/legacy.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.56 2004/08/16 22:54:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.58 2005/02/06 07:36:08 njl Exp $"); /* * This code implements a system driver for legacy systems that do not @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -132,31 +133,24 @@ { device_t child; int i; - struct pcpu *pc; + + /* First, attach the CPU pseudo-driver. */ + for (i = 0; i <= mp_maxid; i++) + if (!CPU_ABSENT(i)) { + child = BUS_ADD_CHILD(dev, 0, "cpu", i); + if (child == NULL) + panic("legacy_attach cpu"); + device_probe_and_attach(child); + } /* - * First, let our child driver's identify any child devices that + * Second, let our child driver's identify any child devices that * they can find. Once that is done attach any devices that we * found. */ bus_generic_probe(dev); bus_generic_attach(dev); - /* Attach CPU pseudo-driver. */ - if (!devclass_get_device(devclass_find("cpu"), 0)) { - for (i = 0; i <= mp_maxid; i++) - if (!CPU_ABSENT(i)) { - pc = pcpu_find(i); - KASSERT(pc != NULL, ("pcpu_find failed")); - child = BUS_ADD_CHILD(dev, 0, "cpu", i); - if (child == NULL) - panic("legacy_attach cpu"); - device_probe_and_attach(child); - pc->pc_device = child; - device_set_ivars(child, pc); - } - } - /* * If we didn't see ISA on a pci bridge, create some * connection points now so it shows up "on motherboard". @@ -244,6 +238,14 @@ */ static int cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result); +static device_t cpu_add_child(device_t bus, int order, const char *name, + int unit); +static struct resource_list *cpu_get_rlist(device_t dev, device_t child); + +struct cpu_device { + struct resource_list cd_rl; + struct pcpu *cd_pcpu; +}; static device_method_t cpu_methods[] = { /* Device interface */ @@ -255,10 +257,15 @@ DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ + DEVMETHOD(bus_add_child, cpu_add_child), DEVMETHOD(bus_read_ivar, cpu_read_ivar), DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), - DEVMETHOD(bus_release_resource, bus_generic_release_resource), + DEVMETHOD(bus_get_resource_list, cpu_get_rlist), + DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), + DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), + DEVMETHOD(bus_alloc_resource, bus_generic_rl_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource), + DEVMETHOD(bus_driver_added, bus_generic_driver_added), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), @@ -275,16 +282,47 @@ static devclass_t cpu_devclass; DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0); +static device_t +cpu_add_child(device_t bus, int order, const char *name, int unit) +{ + struct cpu_device *cd; + device_t child; + struct pcpu *pc; + + if ((cd = malloc(sizeof(*cd), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) + return (NULL); + + resource_list_init(&cd->cd_rl); + pc = pcpu_find(unit); + KASSERT(pc != NULL, ("pcpu_find failed")); + cd->cd_pcpu = pc; + + child = device_add_child_ordered(bus, order, name, unit); + if (child != NULL) { + pc->pc_device = child; + device_set_ivars(child, cd); + } else + free(cd, M_DEVBUF); + return (child); +} + +static struct resource_list * +cpu_get_rlist(device_t dev, device_t child) +{ + struct cpu_device *cpdev; + + cpdev = device_get_ivars(child); + return (&cpdev->cd_rl); +} + static int cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) { - struct pcpu *pc; + struct cpu_device *cpdev; - if (index != 0) + if (index != CPU_IVAR_PCPU) return (ENOENT); - pc = device_get_ivars(child); - if (pc == NULL) - return (ENOENT); - *result = (uintptr_t)pc; + cpdev = device_get_ivars(dev); + *result = (uintptr_t)cpdev->cd_pcpu; return (0); } ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#35 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.626 2005/01/21 06:01:19 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.629 2005/02/06 01:55:06 njl Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -55,9 +55,16 @@ #include "opt_perfmon.h" #include +#include #include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -66,35 +73,27 @@ #include #include #include +#include #include #include -#include -#include -#include +#include #include -#include -#include #include +#include +#include #include -#include +#include #include #include -#include -#include - -#include #include -#include +#include #include -#include #include #include +#include #include -#include - -#include -#include +#include #ifdef DDB #ifndef KDB @@ -105,16 +104,18 @@ #include +#include #include #include -#include -#include -#include #include #include +#include #include -#include +#include #include +#include +#include +#include #ifdef PERFMON #include #endif @@ -127,8 +128,6 @@ #include #include -#include -#include /* Sanity check for __curthread() */ CTASSERT(offsetof(struct pcpu, pc_curthread) == 0); @@ -450,6 +449,52 @@ { } +/* Get current clock frequency for the given cpu id. */ +int +cpu_est_clockrate(int cpu_id, uint64_t *rate) +{ + register_t reg; + uint64_t tsc1, tsc2; + + if (pcpu_find(cpu_id) == NULL || rate == NULL) + return (EINVAL); + + /* If we're booting, trust the rate calibrated moments ago. */ + if (cold) { + *rate = tsc_freq; + return (0); + } + +#ifdef SMP + /* Schedule ourselves on the indicated cpu. */ + mtx_lock_spin(&sched_lock); + sched_bind(curthread, cpu_id); + mtx_unlock_spin(&sched_lock); +#endif + + /* Calibrate by measuring a short delay. */ + reg = intr_disable(); + tsc1 = rdtsc(); + DELAY(1000); + tsc2 = rdtsc(); + intr_restore(reg); + +#ifdef SMP + mtx_lock_spin(&sched_lock); + sched_unbind(curthread); + mtx_unlock_spin(&sched_lock); +#endif + + /* + * Calculate the difference in readings, convert to Mhz, and + * subtract 0.5% of the total. Empirical testing has shown that + * overhead in DELAY() works out to approximately this value. + */ + tsc2 -= tsc1; + *rate = tsc2 * 1000 - tsc2 * 5; + return (0); +} + /* * Shutdown the CPU as much as possible */ ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#41 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.514 2004/12/23 20:16:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.515 2005/02/05 19:21:54 alc Exp $"); /* * Manages physical address maps. @@ -1810,7 +1810,10 @@ if (pbits != obits) { if (!atomic_cmpset_long(pte, obits, pbits)) goto retry; - anychanged = 1; + if (obits & PG_G) + pmap_invalidate_page(pmap, sva); + else + anychanged = 1; } } } ==== //depot/projects/smpng/sys/amd64/conf/NOTES#11 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.20 2004/09/22 01:04:54 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.21 2005/02/05 21:01:09 njl Exp $ # # @@ -205,6 +205,9 @@ #!options ACPI_NO_SEMAPHORES #!options ACPICA_PEDANTIC +# Support for ACPI CPU Performance states via cpufreq(4) +device acpi_perf + # DRM options: # mgadrm: AGP Matrox G200, G400, G450, G550 # r128drm: ATI Rage 128 ==== //depot/projects/smpng/sys/amd64/isa/isa_dma.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.20 2004/09/15 12:09:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.21 2005/02/06 13:46:38 phk Exp $"); /* * code to manage AT bus @@ -61,22 +61,6 @@ #include #include -/* -** Register definitions for DMA controller 1 (channels 0..3): -*/ -#define DMA1_CHN(c) (IO_DMA1 + 1*(2*(c))) /* addr reg for channel c */ -#define DMA1_SMSK (IO_DMA1 + 1*10) /* single mask register */ -#define DMA1_MODE (IO_DMA1 + 1*11) /* mode register */ -#define DMA1_FFC (IO_DMA1 + 1*12) /* clear first/last FF */ - -/* -** Register definitions for DMA controller 2 (channels 4..7): -*/ -#define DMA2_CHN(c) (IO_DMA2 + 2*(2*(c))) /* addr reg for channel c */ -#define DMA2_SMSK (IO_DMA2 + 2*10) /* single mask register */ -#define DMA2_MODE (IO_DMA2 + 2*11) /* mode register */ -#define DMA2_FFC (IO_DMA2 + 2*12) /* clear first/last FF */ - #define ISARAM_END 0x1000000 static int isa_dmarangecheck(caddr_t va, u_int length, int chan); @@ -489,6 +473,19 @@ } /* + * Reached terminal count yet ? + */ +int +isa_dmatc(int chan) +{ + + if (chan < 4) + return(inb(DMA1_STATUS) & (1 << chan)); + else + return(inb(DMA2_STATUS) & (1 << (chan & 3))); +} + +/* * Stop a DMA transfer currently in progress. */ int ==== //depot/projects/smpng/sys/arm/arm/machdep.c#9 (text+ko) ==== @@ -44,12 +44,17 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.9 2005/01/10 22:43:16 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.12 2005/02/06 01:55:07 njl Exp $"); #include +#include #include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -57,34 +62,31 @@ #include #include #include -#include #include -#include -#include -#include -#include +#include #include +#include #include -#include -#include -#include -#include #include #include +#include #include #include #include -#include #include + +#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include #define MDROOT_ADDR 0xd0400000 @@ -236,6 +238,14 @@ SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) +/* Get current clock frequency for the given cpu id. */ +int +cpu_est_clockrate(int cpu_id, uint64_t *rate) +{ + + return (ENXIO); +} + void cpu_idle(void) { ==== //depot/projects/smpng/sys/arm/include/cpu.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: cpu.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $ */ -/* $FreeBSD: src/sys/arm/include/cpu.h,v 1.3 2004/11/04 19:15:43 cognet Exp $ */ +/* $FreeBSD: src/sys/arm/include/cpu.h,v 1.4 2005/02/01 06:36:27 njl Exp $ */ #ifndef MACHINE_CPU_H #define MACHINE_CPU_H @@ -45,10 +45,10 @@ extern vm_offset_t vector_page; -void fork_trampoline(void); -void *initarm(void *, void *); -void arm_vector_init(vm_offset_t, int); -void identify_arm_cpu(void); +void arm_vector_init(vm_offset_t, int); +void fork_trampoline(void); +void identify_arm_cpu(void); +void *initarm(void *, void *); extern char btext[]; extern char etext[]; ==== //depot/projects/smpng/sys/coda/coda_vnops.c#21 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.62 2005/01/28 14:42:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.63 2005/02/07 08:04:24 phk Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 7 19:57:43 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87CAE16A4D0; Mon, 7 Feb 2005 19:57:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D33716A4CE for ; Mon, 7 Feb 2005 19:57:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3162D43D2D for ; Mon, 7 Feb 2005 19:57:43 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17JvhGh035065 for ; Mon, 7 Feb 2005 19:57:43 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17JvgVx035062 for perforce@freebsd.org; Mon, 7 Feb 2005 19:57:42 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Feb 2005 19:57:42 GMT Message-Id: <200502071957.j17JvgVx035062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 70541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 19:57:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=70541 Change 70541 by jhb@jhb_slimer on 2005/02/07 19:57:37 IFC @70539. Affected files ... .. //depot/projects/smpng/sys/dev/vge/if_vge.c#4 integrate Differences ... ==== //depot/projects/smpng/sys/dev/vge/if_vge.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.4 2005/01/06 01:43:31 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.5 2005/02/07 19:39:29 glebius Exp $"); /* * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver. @@ -97,7 +97,6 @@ #include #include #include -#include #include @@ -1570,19 +1569,15 @@ if (sc->vge_link) { if (!(mii->mii_media_status & IFM_ACTIVE)) { sc->vge_link = 0; -#ifdef LINK_STATE_UP - sc->arpcom.ac_if.if_link_state = LINK_STATE_UP; - rt_ifmsg(&(sc->arpcom.ac_if)); -#endif /* LINK_STATE_UP */ + if_link_state_change(&sc->arpcom.ac_if, + LINK_STATE_UP); } } else { if (mii->mii_media_status & IFM_ACTIVE && IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) { sc->vge_link = 1; -#ifdef LINK_STATE_DOWN - sc->arpcom.ac_if.if_link_state = LINK_STATE_DOWN; - rt_ifmsg(&(sc->arpcom.ac_if)); -#endif /* LINK_STATE_DOWN */ + if_link_state_change(&sc->arpcom.ac_if, + LINK_STATE_DOWN); #if __FreeBSD_version < 502114 if (ifp->if_snd.ifq_head != NULL) #else From owner-p4-projects@FreeBSD.ORG Mon Feb 7 20:11:00 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29B5416A4D0; Mon, 7 Feb 2005 20:11:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E131016A4CE for ; Mon, 7 Feb 2005 20:10:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5E5C43D4C for ; Mon, 7 Feb 2005 20:10:59 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17KAxQ1035591 for ; Mon, 7 Feb 2005 20:10:59 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17KAxMt035588 for perforce@freebsd.org; Mon, 7 Feb 2005 20:10:59 GMT (envelope-from areisse@nailabs.com) Date: Mon, 7 Feb 2005 20:10:59 GMT Message-Id: <200502072010.j17KAxMt035588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 70542 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 20:11:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=70542 Change 70542 by areisse@areisse_tislabs on 2005/02/07 20:10:50 Introduce a kernel interface for reading and setting TE policy booleans (which affect the conditional rules). Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscalls.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/conditional.c#4 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/policydb.h#7 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/security.h#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/services.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#6 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -72,11 +73,26 @@ return (rc); } +static int +sebsd_get_bools(struct thread *td, struct sebsd_get_bools *gb) +{ + char *out = NULL; + if (gb->out) + out = malloc(gb->len, M_SEBSD, M_WAITOK); + int err = security_get_bool_string(&gb->len, out); + if (out && err == 0) + err = copyout(out, gb->out, gb->len); + if (out) + free(out, M_SEBSD); + return (err); +} + int sebsd_syscall(struct thread *td, int call, void *args) { int err = EINVAL; struct lp_args p; + struct sebsd_get_bools gb; switch(call) { case SEBSDCALL_LOAD_POLICY: @@ -84,6 +100,58 @@ return (EFAULT); err = sys_load_policy (td, p.data, p.len); break; + + case SEBSDCALL_GET_BOOLS: + if (copyin(args, &gb, sizeof (struct sebsd_get_bools))) + return (EFAULT); + err = sebsd_get_bools(td, &gb); + if (copyout(&gb, args, sizeof (struct sebsd_get_bools))) + return (EFAULT); + break; + + case SEBSDCALL_GET_BOOL: + { + char str[128]; + int active, pending; + err = copyinstr(args,str, 128, NULL); + if (err) + return (err); + security_get_bool(str, &active, &pending); + *td->td_retval = active | (pending << 1); + return (0); + } + + case SEBSDCALL_SET_BOOL: + { + char *str; + + err = thread_has_security(td, SECURITY__SETBOOL); + if (err) + return (err); + + if (copyin(args, &p, sizeof (struct lp_args))) + return (EFAULT); + str = malloc(p.len, M_SEBSD, M_WAITOK); + if (!str) + return (ENOMEM); + if (copyin(p.data, str, p.len)) { + free(str, M_SEBSD); + return (EFAULT); + } + + str[p.len-1] = 0; + err = security_set_bool(str+1, str[0]-'0'); + free(str, M_SEBSD); + break; + } + + case SEBSDCALL_COMMIT_BOOLS: + err = thread_has_security(td, SECURITY__SETBOOL); + if (err) + return (err); + + return security_commit_pending_bools(); + default: err = EINVAL; break; ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscalls.h#6 (text+ko) ==== @@ -7,6 +7,10 @@ * TBD: Should we really try to line up with SELinux? */ #define SEBSDCALL_LOAD_POLICY 7 +#define SEBSDCALL_GET_BOOLS 8 +#define SEBSDCALL_GET_BOOL 9 +#define SEBSDCALL_SET_BOOL 10 +#define SEBSDCALL_COMMIT_BOOLS 11 #define SEBSDCALL_NUM 7 @@ -27,6 +31,10 @@ u32 seqno; }; +struct sebsd_get_bools { + int len; + char *out; +}; #endif /* _SEBSD_SYSCALLS_H_ */ ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/conditional.c#4 (text+ko) ==== @@ -233,6 +233,7 @@ booldatum->value = le32_to_cpu(buf[0]); booldatum->state = le32_to_cpu(buf[1]); + booldatum->pending = booldatum->state; if (!bool_isvalid(booldatum)) goto err; ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/policydb.h#7 (text+ko) ==== @@ -121,6 +121,7 @@ struct cond_bool_datum { u32 value; /* internal type value */ int state; + int pending; /* value to be used after next commit */ }; struct cond_node; ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/security.h#8 (text+ko) ==== @@ -93,5 +93,10 @@ #define security_free_context(ctx) ({ if (ctx) free(ctx, M_SEBSD); }) +int security_get_bool_string(int *len, char *out); +int security_commit_pending_bools(); +int security_set_bool(char *name, int value); +int security_get_bool(char *name, int *value, int *pending); + #endif /* _SELINUX_SECURITY_H_ */ ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/services.c#9 (text+ko) ==== @@ -1503,6 +1503,39 @@ return rc; } +int security_get_bool_string(int *len, char *out) +{ + int i; + int needed = 1; + int err = 0; + + POLICY_RDLOCK; + for (i = 0; i < policydb.p_bools.nprim; i++) { + needed += 3; + needed += strlen(policydb.p_bool_val_to_name[i]); + } + + if (*len >= needed && out) { + *len = needed; + char *p = out; + + for (i = 0; i < policydb.p_bools.nprim; i++) { + *p++ = '0' + policydb.bool_val_to_struct[i]->state; + *p++ = '0' + policydb.bool_val_to_struct[i]->pending; + strcpy(p, policydb.p_bool_val_to_name[i]); + p += strlen(policydb.p_bool_val_to_name[i]); + *p++ = ';'; + } + *p++ = 0; + } else { + *len = needed; + err = ENOMEM; + } + + POLICY_RDUNLOCK; + return err; +} + int security_get_bools(int *len, char ***names, int **values) { int i, rc = ENOMEM; @@ -1551,6 +1584,72 @@ goto out; } +int security_commit_pending_bools(void) +{ + int i, rc = 0, seqno; + struct cond_node *cur; + + POLICY_WRLOCK; + printk(KERN_INFO "security: committed booleans { "); + for (i = 0; i < policydb.p_bools.nprim; i++) { + policydb.bool_val_to_struct[i]->state = + policydb.bool_val_to_struct[i]->pending; + + if (i != 0) + printk(", "); + printk("%s:%d", policydb.p_bool_val_to_name[i], + policydb.bool_val_to_struct[i]->state); + } + + printk(" }\n"); + + for (cur = policydb.cond_list; cur != NULL; cur = cur->next) { + rc = evaluate_cond_node(&policydb, cur); + if (rc) + goto out; + } + + seqno = ++latest_granting; + +out: + POLICY_WRUNLOCK; + if (!rc) + avc_ss_reset(seqno); + return (rc); +} + +int security_set_bool(char *name, int value) +{ + int i; + POLICY_WRLOCK; + + for (i = 0; i < policydb.p_bools.nprim; i++) + if (!strcmp(name, policydb.p_bool_val_to_name[i])) { + policydb.bool_val_to_struct[i]->pending = value; + POLICY_WRUNLOCK; + return (0); + } + + POLICY_WRUNLOCK; + return (ENOENT); +} + +int security_get_bool(char *name, int *value, int *pending) +{ + int i; + POLICY_RDLOCK; + + for (i = 0; i < policydb.p_bools.nprim; i++) + if (!strcmp(name, policydb.p_bool_val_to_name[i])) { + *pending = policydb.bool_val_to_struct[i]->pending; + *value = policydb.bool_val_to_struct[i]->state; + POLICY_RDUNLOCK; + return (0); + } + + POLICY_RDUNLOCK; + return (ENOENT); +} int security_set_bools(int len, int *values) { From owner-p4-projects@FreeBSD.ORG Mon Feb 7 20:19:11 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0312216A4D0; Mon, 7 Feb 2005 20:19:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A697416A4CE for ; Mon, 7 Feb 2005 20:19:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7000E43D46 for ; Mon, 7 Feb 2005 20:19:10 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17KJAhe035835 for ; Mon, 7 Feb 2005 20:19:10 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17KJAvV035832 for perforce@freebsd.org; Mon, 7 Feb 2005 20:19:10 GMT (envelope-from areisse@nailabs.com) Date: Mon, 7 Feb 2005 20:19:10 GMT Message-Id: <200502072019.j17KJAvV035832@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 70544 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 20:19:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=70544 Change 70544 by areisse@areisse_tislabs on 2005/02/07 20:18:30 Change the TE policy to allow the ssh_sysadm_login boolean to work if UseLogin is enabled (which it must be on SEBSD). Provide the boolean interface from selinux in libsebsd. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/booleans.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#11 edit .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/Makefile#7 edit .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/sebsd_config.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/booleans.c#2 (text+ko) ==== @@ -20,196 +20,108 @@ #include #include +#include #include "policy.h" -#define SELINUX_BOOL_DIR "/booleans/" +int security_get_boolean_names(char ***names, int *len) +{ + struct sebsd_get_bools gb; + int i, err, rc = -1; + char **n; + int num = 0; + char *p, *q; + + gb.out = NULL; + gb.len = 0; -static int filename_select(const struct dirent *d) -{ - int len; + err = mac_syscall("sebsd", SEBSDCALL_GET_BOOLS, &gb); - len = strlen(d->d_name); - if (len == 1 && d->d_name[0] == '.') - return 0; - if (len == 2 && d->d_name[0] == '.' && - d->d_name[1] == '.') - return 0; - return 1; -} + if (err && errno != ENOMEM) + return (-1); + gb.out = malloc (gb.len); -int security_get_boolean_names(char ***names, int *len) -{ - char path[PATH_MAX]; - int i, rc; - struct dirent **namelist; - char **n; + err = mac_syscall("sebsd", SEBSDCALL_GET_BOOLS, &gb); + if (err) + goto out; - assert(len); + for (p = gb.out; p-gb.out < gb.len; p++) + if (*p == ';') + num++; - snprintf(path, sizeof path, "%s%s", selinux_mnt, SELINUX_BOOL_DIR); - *len = scandir(path, &namelist, &filename_select, - alphasort); - if (*len <= 0) { - return -1; - } + n = (char**)malloc(sizeof(char*) * num); + if (!n) + goto out; - n = (char**)malloc(sizeof(char*) * *len); - if (!n) { - rc = -1; - goto bad; - } + p = gb.out; + for (i = 0; i < num; i++) { + p += 2; + for (q = p; *q != ';'; q++); - memset(n, 0, sizeof(char*) * *len); - - for (i = 0; i < *len; i++) { - n[i] = (char*)malloc(sizeof(char) - * (namelist[i]->d_reclen + 1)); - if (!n[i]) { - rc = -1; + n[i] = (char*)malloc(sizeof(char) * (1+q-p)); + if (!n[i]) goto bad; - } - strncpy(n[i], namelist[i]->d_name, namelist[i]->d_reclen + 1); + strncpy(n[i], p, q-p); + n[i][q-p] = 0; + p = q+1; } rc = 0; *names = n; -out: - for (i = 0; i < *len; i++) { - free(namelist[i]); - } - free(namelist); - return rc; + *len = num; + goto out; + bad: for (i = 0; i < *len; i++) { if (n[i]) free(n[i]); } free(n); - goto out; -} +out: + if (gb.out) + free(gb.out); -#define STRBUF_SIZE 3 -static int get_bool_value(const char *name, char **buf) -{ - int fd, len; - char *fname = NULL; - - *buf = (char*)malloc(sizeof(char) * (STRBUF_SIZE + 1)); - if (!*buf) - goto out; - (*buf)[STRBUF_SIZE] = 0; - - len = strlen(name) + strlen(selinux_mnt) + sizeof(SELINUX_BOOL_DIR); - fname = (char*)malloc(sizeof(char) * len); - if (!fname) - goto out; - snprintf(fname, len, "%s%s%s", selinux_mnt, SELINUX_BOOL_DIR, name); - - fd = open(fname, O_RDONLY); - if (fd < 0) - goto out; - - len = read(fd, *buf, STRBUF_SIZE); - close(fd); - if (len != STRBUF_SIZE) - goto out; - - free(fname); - return 0; -out: - if (*buf) - free(*buf); - if (fname) - free(fname); - return -1; + return rc; } int security_get_boolean_pending(const char *name) { - char *buf; - int val; - - if (get_bool_value(name, &buf)) + int r = mac_syscall("sebsd", SEBSDCALL_GET_BOOL, name); + if (r < 0) return -1; - - if (atoi(&buf[1])) - val = 1; - else - val = 0; - free(buf); - return val; + return (r & 2) >> 1; } int security_get_boolean_active(const char *name) { - char *buf; - int val; - - if (get_bool_value(name, &buf)) + int r = mac_syscall("sebsd", SEBSDCALL_GET_BOOL, name); + if (r < 0) return -1; + return (r & 1); +} - buf[1] = '\0'; - if (atoi(buf)) - val = 1; - else - val = 0; - free(buf); - return val; -} +struct lp_args +{ + void *data; + size_t len; +}; int security_set_boolean(const char *name, int value) { - int fd, ret, len; - char buf[2], *fname; + struct lp_args args; + char str[strlen(name) + 2]; - len = strlen(name) + strlen(selinux_mnt) + sizeof(SELINUX_BOOL_DIR); - fname = (char*)malloc(sizeof(char) * len); - if (!fname) - return -1; - snprintf(fname, len, "%s%s%s", selinux_mnt, SELINUX_BOOL_DIR, name); - - fd = open(fname, O_WRONLY); - if (fd < 0) { - ret = -1; - goto out; - } - - if (value) - buf[0] = '1'; - else - buf[0] = '0'; - buf[1] = '\0'; - - ret = write(fd, buf, 2); - close(fd); -out: - free(fname); - if (ret > 0) - return 0; - else - return -1; + str[0] = value + '0'; + strcpy (str+1, name); + args.data = str; + args.len = 1+strlen(str); + int err = mac_syscall("sebsd", SEBSDCALL_SET_BOOL, &args); + if (err) + perror (name); + return err; } int security_commit_booleans(void) { - int fd, ret; - char buf[2]; - char path[PATH_MAX]; - - snprintf(path, sizeof path, "%s/commit_pending_bools", selinux_mnt); - fd = open(path, O_WRONLY); - if (fd < 0) - return -1; - - buf[0] = '1'; - buf[1] = '\0'; - - ret = write(fd, buf, 2); - close(fd); - - if (ret > 0) - return 0; - else - return -1; + return mac_syscall ("sebsd", SEBSDCALL_COMMIT_BOOLS, NULL); } static char *strtrim(char *dest, char *source, int size) { ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#11 (text+ko) ==== @@ -302,5 +302,9 @@ # run user shells domain_auto_trans(sshd_login_t, shell_exec_t, user_t) + +if (ssh_sysadm_login) { +domain_trans(sshd_login_t, shell_exec_t, userdomain) +} else { domain_trans(sshd_login_t, shell_exec_t, unpriv_userdomain) - +} ==== //depot/projects/trustedbsd/sebsd/lib/libsebsd/Makefile#7 (text+ko) ==== @@ -16,7 +16,7 @@ getseccontext.c query_user_context.c security_change_context.c \ string_to_security_class.c security_compute_av.c context.c \ get_default_type.c filecon.c sebsd_config.c \ - freecon.c freeconary.c + freecon.c freeconary.c booleans.c INCSDIR=${INCLUDEDIR}/selinux ==== //depot/projects/trustedbsd/sebsd/lib/libsebsd/sebsd_config.c#2 (text+ko) ==== @@ -5,3 +5,8 @@ { return _DEFTYPE_PATH; } + +char *selinux_booleans_path() +{ + return "/etc/security/sebsd/booleans"; +} From owner-p4-projects@FreeBSD.ORG Mon Feb 7 22:32:23 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C6F916A4D0; Mon, 7 Feb 2005 22:32:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC93216A4CE for ; Mon, 7 Feb 2005 22:32:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 612A643D41 for ; Mon, 7 Feb 2005 22:32:22 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17MWMSZ048279 for ; Mon, 7 Feb 2005 22:32:22 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17MWM7d048276 for perforce@freebsd.org; Mon, 7 Feb 2005 22:32:22 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Feb 2005 22:32:22 GMT Message-Id: <200502072232.j17MWM7d048276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 70564 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 22:32:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=70564 Change 70564 by jhb@jhb_slimer on 2005/02/07 22:31:33 IFC @70562 (more loopback). Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#19 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#6 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#39 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#14 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#22 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#19 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_util.h#6 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_fcntl.c#12 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#19 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_msg.c#5 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_other.c#7 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_stat.c#13 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_util.c#9 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_util.h#7 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#11 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#33 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#84 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#17 integrate Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#19 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.34 2005/01/05 22:34:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.35 2005/02/07 21:53:41 jhb Exp $"); #include "opt_mac.h" @@ -41,6 +41,7 @@ /*#include */ #include #include +#include #include #include #include @@ -366,16 +367,14 @@ struct svr4_sys_open_args *uap; { struct proc *p = td->td_proc; - int error, retval; - struct open_args cup; + char *newpath; + int bsd_flags, error, retval; - caddr_t sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->path); + CHECKALTEXIST(td, uap->path, &newpath); - (&cup)->path = uap->path; - (&cup)->flags = svr4_to_bsd_flags(uap->flags); - (&cup)->mode = uap->mode; - error = open(td, &cup); + bsd_flags = svr4_to_bsd_flags(uap->flags); + error = kern_open(td, newpath, UIO_SYSSPACE, bsd_flags, uap->mode); + free(newpath, M_TEMP); if (error) { /* uprintf("svr4_open(%s, 0x%0x, 0%o): %d\n", uap->path, @@ -386,8 +385,8 @@ retval = td->td_retval[0]; PROC_LOCK(p); - if (!(cup.flags & O_NOCTTY) && SESS_LEADER(p) && - !(td->td_proc->p_flag & P_CONTROLT)) { + if (!(bsd_flags & O_NOCTTY) && SESS_LEADER(p) && + !(p->p_flag & P_CONTROLT)) { #if defined(NOTYET) struct file *fp; @@ -427,16 +426,15 @@ register struct thread *td; struct svr4_sys_creat_args *uap; { - struct open_args cup; + char *newpath; + int error; - caddr_t sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->path); + CHECKALTEXIST(td, uap->path, &newpath); - cup.path = uap->path; - cup.mode = uap->mode; - cup.flags = O_WRONLY | O_CREAT | O_TRUNC; - - return open(td, &cup); + error = kern_open(td, newpath, UIO_SYSSPACE, O_WRONLY | O_CREAT | + O_TRUNC, uap->mode); + free(newpath, M_TEMP); + return (error); } int @@ -473,18 +471,13 @@ register struct thread *td; struct svr4_sys_access_args *uap; { - struct access_args cup; - int *retval; + char *newpath; + int error; - caddr_t sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->path); - - retval = td->td_retval; - - cup.path = uap->path; - cup.flags = uap->flags; - - return access(td, &cup); + CHECKALTEXIST(td, uap->path, &newpath); + error = kern_access(td, newpath, UIO_SYSSPACE, uap->flags); + free(newpath, M_TEMP); + return (error); } #if defined(NOTYET) ==== //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#6 (text+ko) ==== @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ipc.c,v 1.14 2005/01/05 22:34:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ipc.c,v 1.15 2005/02/07 21:53:41 jhb Exp $"); #include #include @@ -527,49 +527,32 @@ void *v; register_t *retval; { - int error; struct svr4_sys_msgctl_args *uap = v; - struct sys_msgctl_args ap; struct svr4_msqid_ds ss; struct msqid_ds bs; - caddr_t sg = stackgap_init(); - - ap.msqid = uap->msqid; - ap.cmd = uap->cmd; - ap.buf = stackgap_alloc(&sg, sizeof(bs)); + int error; switch (uap->cmd) { case SVR4_IPC_STAT: - ap.cmd = IPC_STAT; - if ((error = sys_msgctl(p, &ap, retval)) != 0) - return error; - error = copyin(&bs, ap.buf, sizeof bs); + error = kern_msgctl(td, uap->msqid, IPC_STAT, &bs); if (error) return error; bsd_to_svr4_msqid_ds(&bs, &ss); return copyout(&ss, uap->buf, sizeof ss); case SVR4_IPC_SET: - ap.cmd = IPC_SET; error = copyin(uap->buf, &ss, sizeof ss); if (error) return error; svr4_to_bsd_msqid_ds(&ss, &bs); - error = copyout(&bs, ap.buf, sizeof bs); - if (error) - return error; - return sys_msgctl(p, &ap, retval); + return (kern_msgctl(td, uap->msqid, IPC_SET, &bs)); case SVR4_IPC_RMID: - ap.cmd = IPC_RMID; error = copyin(uap->buf, &ss, sizeof ss); if (error) return error; svr4_to_bsd_msqid_ds(&ss, &bs); - error = copyout(&bs, ap.buf, sizeof bs); - if (error) - return error; - return sys_msgctl(p, &ap, retval); + return (kern_msgctl(td, uap->msqid, IPC_RMID, &bs)); default: return EINVAL; ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#39 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.78 2005/01/05 22:34:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.79 2005/02/07 21:53:41 jhb Exp $"); #include "opt_mac.h" @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -164,17 +165,18 @@ struct thread *td; struct svr4_sys_execv_args *uap; { - struct execve_args ap; - caddr_t sg; + struct image_args eargs; + char *path; + int error; - sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->path); + CHECKALTEXIST(td, uap->path, &path); - ap.fname = uap->path; - ap.argv = uap->argp; - ap.envv = NULL; - - return execve(td, &ap); + error = exec_copyin_args(&eargs, path, UIO_SYSSPACE, uap->argp, NULL); + free(path, M_TEMP); + if (error == 0) + error = kern_execve(td, &eargs, NULL); + exec_free_args(&eargs); + return (error); } int @@ -182,17 +184,19 @@ struct thread *td; struct svr4_sys_execve_args *uap; { - struct execve_args ap; - caddr_t sg; + struct image_args eargs; + char *path; + int error; - sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->path); + CHECKALTEXIST(td, uap->path, &path); - ap.fname = uap->path; - ap.argv = uap->argp; - ap.envv = uap->envp; - - return execve(td, &ap); + error = exec_copyin_args(&eargs, path, UIO_SYSSPACE, uap->argp, + uap->envp); + free(path, M_TEMP); + if (error == 0) + error = kern_execve(td, &eargs, NULL); + exec_free_args(&eargs); + return (error); } int @@ -638,22 +642,17 @@ svr4_mode_t mode; svr4_dev_t dev; { - caddr_t sg = stackgap_init(); + char *newpath; + int error; - CHECKALTEXIST(td, &sg, path); + CHECKALTEXIST(td, path, &newpath); - if (S_ISFIFO(mode)) { - struct mkfifo_args ap; - ap.path = path; - ap.mode = mode; - return mkfifo(td, &ap); - } else { - struct mknod_args ap; - ap.path = path; - ap.mode = mode; - ap.dev = dev; - return mknod(td, &ap); - } + if (S_ISFIFO(mode)) + error = kern_mkfifo(td, newpath, UIO_SYSSPACE, mode); + else + error = kern_mknod(td, newpath, UIO_SYSSPACE, mode, dev); + free(newpath, M_TEMP); + return (error); } @@ -1433,25 +1432,18 @@ struct thread *td; struct svr4_sys_statvfs_args *uap; { - struct statfs_args fs_args; - caddr_t sg = stackgap_init(); - struct statfs *fs = stackgap_alloc(&sg, sizeof(struct statfs)); + struct svr4_statvfs sfs; struct statfs bfs; - struct svr4_statvfs sfs; + char *path; int error; - CHECKALTEXIST(td, &sg, uap->path); - fs_args.path = uap->path; - fs_args.buf = fs; + CHECKALTEXIST(td, uap->path, &path); - if ((error = statfs(td, &fs_args)) != 0) - return error; - - if ((error = copyin(fs, &bfs, sizeof(bfs))) != 0) - return error; - + error = kern_statfs(td, path, UIO_SYSSPACE, &bfs); + free(path, M_TEMP); + if (error) + return (error); bsd_statfs_to_svr4_statvfs(&bfs, &sfs); - return copyout(&sfs, uap->fs, sizeof(sfs)); } @@ -1461,24 +1453,14 @@ struct thread *td; struct svr4_sys_fstatvfs_args *uap; { - struct fstatfs_args fs_args; - caddr_t sg = stackgap_init(); - struct statfs *fs = stackgap_alloc(&sg, sizeof(struct statfs)); + struct svr4_statvfs sfs; struct statfs bfs; - struct svr4_statvfs sfs; int error; - fs_args.fd = uap->fd; - fs_args.buf = fs; - - if ((error = fstatfs(td, &fs_args)) != 0) - return error; - - if ((error = copyin(fs, &bfs, sizeof(bfs))) != 0) - return error; - + error = kern_fstatfs(td, uap->fd, &bfs); + if (error) + return (error); bsd_statfs_to_svr4_statvfs(&bfs, &sfs); - return copyout(&sfs, uap->fs, sizeof(sfs)); } @@ -1488,25 +1470,18 @@ struct thread *td; struct svr4_sys_statvfs64_args *uap; { - struct statfs_args fs_args; - caddr_t sg = stackgap_init(); - struct statfs *fs = stackgap_alloc(&sg, sizeof(struct statfs)); + struct svr4_statvfs64 sfs; struct statfs bfs; - struct svr4_statvfs64 sfs; + char *path; int error; - CHECKALTEXIST(td, &sg, uap->path); - fs_args.path = uap->path; - fs_args.buf = fs; + CHECKALTEXIST(td, uap->path, &path); - if ((error = statfs(td, &fs_args)) != 0) - return error; - - if ((error = copyin(fs, &bfs, sizeof(bfs))) != 0) - return error; - + error = kern_statfs(td, path, UIO_SYSSPACE, &bfs); + free(path, M_TEMP); + if (error) + return (error); bsd_statfs_to_svr4_statvfs64(&bfs, &sfs); - return copyout(&sfs, uap->fs, sizeof(sfs)); } @@ -1516,24 +1491,14 @@ struct thread *td; struct svr4_sys_fstatvfs64_args *uap; { - struct fstatfs_args fs_args; - caddr_t sg = stackgap_init(); - struct statfs *fs = stackgap_alloc(&sg, sizeof(struct statfs)); + struct svr4_statvfs64 sfs; struct statfs bfs; - struct svr4_statvfs64 sfs; int error; - fs_args.fd = uap->fd; - fs_args.buf = fs; - - if ((error = fstatfs(td, &fs_args)) != 0) - return error; - - if ((error = copyin(fs, &bfs, sizeof(bfs))) != 0) - return error; - + error = kern_fstatfs(td, uap->fd, &bfs); + if (error) + return (error); bsd_statfs_to_svr4_statvfs64(&bfs, &sfs); - return copyout(&sfs, uap->fs, sizeof(sfs)); } @@ -1542,28 +1507,19 @@ struct thread *td; struct svr4_sys_alarm_args *uap; { + struct itimerval itv, oitv; int error; - struct itimerval *itp, *oitp; - struct setitimer_args sa; - caddr_t sg = stackgap_init(); - itp = stackgap_alloc(&sg, sizeof(*itp)); - oitp = stackgap_alloc(&sg, sizeof(*oitp)); - timevalclear(&itp->it_interval); - itp->it_value.tv_sec = uap->sec; - itp->it_value.tv_usec = 0; - - sa.which = ITIMER_REAL; - sa.itv = itp; - sa.oitv = oitp; - error = setitimer(td, &sa); + timevalclear(&itv.it_interval); + itv.it_value.tv_sec = uap->sec; + itv.it_value.tv_usec = 0; + error = kern_setitimer(td, ITIMER_REAL, &itv, &oitv); if (error) - return error; - if (oitp->it_value.tv_usec) - oitp->it_value.tv_sec++; - td->td_retval[0] = oitp->it_value.tv_sec; - return 0; - + return (error); + if (oitv.it_value.tv_usec != 0) + oitv.it_value.tv_sec++; + td->td_retval[0] = oitv.it_value.tv_sec; + return (0); } int ==== //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.19 2005/01/05 22:34:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.20 2005/02/07 21:53:42 jhb Exp $"); #include #include @@ -36,8 +36,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -160,33 +162,23 @@ struct thread *td; struct svr4_sys_stat_args *uap; { - struct stat st; - struct svr4_stat svr4_st; - struct stat_args cup; - int error; - caddr_t sg = stackgap_init(); + struct svr4_stat svr4_st; + struct stat st; + char *path; + int error; - CHECKALTEXIST(td, &sg, uap->path); + CHECKALTEXIST(td, uap->path, &path); - cup.path = uap->path; - cup.ub = stackgap_alloc(&sg, sizeof(struct stat)); - - - if ((error = stat(td, &cup)) != 0) - return error; - - if ((error = copyin(cup.ub, &st, sizeof st)) != 0) - return error; - + error = kern_stat(td, path, UIO_SYSSPACE, &st); + free(path, M_TEMP); + if (error) + return (error); bsd_to_svr4_stat(&st, &svr4_st); if (S_ISSOCK(st.st_mode)) (void) svr4_add_socket(td, uap->path, &st); - if ((error = copyout(&svr4_st, uap->ub, sizeof svr4_st)) != 0) - return error; - - return 0; + return (copyout(&svr4_st, uap->ub, sizeof svr4_st)); } @@ -195,32 +187,23 @@ register struct thread *td; struct svr4_sys_lstat_args *uap; { - struct stat st; - struct svr4_stat svr4_st; - struct lstat_args cup; - int error; - caddr_t sg = stackgap_init(); + struct svr4_stat svr4_st; + struct stat st; + char *path; + int error; - CHECKALTEXIST(td, &sg, uap->path); + CHECKALTEXIST(td, uap->path, &path); - cup.path = uap->path; - cup.ub = stackgap_alloc(&sg, sizeof(struct stat)); - - if ((error = lstat(td, &cup)) != 0) - return error; - - if ((error = copyin(cup.ub, &st, sizeof st)) != 0) - return error; - + error = kern_lstat(td, path, UIO_SYSSPACE, &st); + free(path, M_TEMP); + if (error) + return (error); bsd_to_svr4_stat(&st, &svr4_st); if (S_ISSOCK(st.st_mode)) (void) svr4_add_socket(td, uap->path, &st); - if ((error = copyout(&svr4_st, uap->ub, sizeof svr4_st)) != 0) - return error; - - return 0; + return (copyout(&svr4_st, uap->ub, sizeof svr4_st)); } @@ -229,27 +212,16 @@ register struct thread *td; struct svr4_sys_fstat_args *uap; { - struct stat st; - struct svr4_stat svr4_st; - struct fstat_args cup; - int error; - caddr_t sg = stackgap_init(); + struct svr4_stat svr4_st; + struct stat st; + int error; - cup.fd = uap->fd; - cup.sb = stackgap_alloc(&sg, sizeof(struct stat)); - if ((error = fstat(td, &cup)) != 0) - return error; - - if ((error = copyin(cup.sb, &st, sizeof st)) != 0) - return error; - + error = kern_fstat(td, uap->fd, &st); + if (error) + return (error); bsd_to_svr4_stat(&st, &svr4_st); - - if ((error = copyout(&svr4_st, uap->sb, sizeof svr4_st)) != 0) - return error; - - return 0; + return (copyout(&svr4_st, uap->sb, sizeof svr4_st)); } @@ -258,22 +230,17 @@ register struct thread *td; struct svr4_sys_xstat_args *uap; { - struct stat st; - struct svr4_xstat svr4_st; - struct stat_args cup; - int error; + struct svr4_xstat svr4_st; + struct stat st; + char *path; + int error; - caddr_t sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->path); + CHECKALTEXIST(td, uap->path, &path); - cup.path = uap->path; - cup.ub = stackgap_alloc(&sg, sizeof(struct stat)); - - if ((error = stat(td, &cup)) != 0) - return error; - - if ((error = copyin(cup.ub, &st, sizeof st)) != 0) - return error; + error = kern_stat(td, path, UIO_SYSSPACE, &st); + free(path, M_TEMP); + if (error) + return (error); bsd_to_svr4_xstat(&st, &svr4_st); @@ -282,10 +249,7 @@ (void) svr4_add_socket(td, uap->path, &st); #endif - if ((error = copyout(&svr4_st, uap->ub, sizeof svr4_st)) != 0) - return error; - - return 0; + return (copyout(&svr4_st, uap->ub, sizeof svr4_st)); } int @@ -293,32 +257,25 @@ register struct thread *td; struct svr4_sys_lxstat_args *uap; { - struct stat st; - struct svr4_xstat svr4_st; - struct lstat_args cup; - int error; - caddr_t sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->path); + struct svr4_xstat svr4_st; + struct stat st; + char *path; + int error; - cup.path = uap->path; - cup.ub = stackgap_alloc(&sg, sizeof(struct stat)); + CHECKALTEXIST(td, uap->path, &path); - if ((error = lstat(td, &cup)) != 0) - return error; + error = kern_lstat(td, path, UIO_SYSSPACE, &st); + free(path, M_TEMP); + if (error) + return (error); - if ((error = copyin(cup.ub, &st, sizeof st)) != 0) - return error; - bsd_to_svr4_xstat(&st, &svr4_st); #if defined(SOCKET_NOTYET) if (S_ISSOCK(st.st_mode)) (void) svr4_add_socket(td, uap->path, &st); #endif - if ((error = copyout(&svr4_st, uap->ub, sizeof svr4_st)) != 0) - return error; - - return 0; + return (copyout(&svr4_st, uap->ub, sizeof svr4_st)); } @@ -327,28 +284,16 @@ register struct thread *td; struct svr4_sys_fxstat_args *uap; { - struct stat st; - struct svr4_xstat svr4_st; - struct fstat_args cup; - int error; + struct svr4_xstat svr4_st; + struct stat st; + int error; - caddr_t sg = stackgap_init(); - cup.fd = uap->fd; - cup.sb = stackgap_alloc(&sg, sizeof(struct stat)); - - if ((error = fstat(td, &cup)) != 0) - return error; - - if ((error = copyin(cup.sb, &st, sizeof st)) != 0) - return error; - + error = kern_fstat(td, uap->fd, &st); + if (error) + return (error); bsd_to_svr4_xstat(&st, &svr4_st); - - if ((error = copyout(&svr4_st, uap->sb, sizeof svr4_st)) != 0) - return error; - - return 0; + return (copyout(&svr4_st, uap->sb, sizeof svr4_st)); } int @@ -356,32 +301,24 @@ register struct thread *td; struct svr4_sys_stat64_args *uap; { - struct stat st; - struct svr4_stat64 svr4_st; - struct stat_args cup; - int error; - caddr_t sg = stackgap_init(); + struct svr4_stat64 svr4_st; + struct stat st; + char *path; + int error; - CHECKALTEXIST(td, &sg, uap->path); + CHECKALTEXIST(td, uap->path, &path); - cup.path = uap->path; - cup.ub = stackgap_alloc(&sg, sizeof(struct stat)); - - if ((error = stat(td, &cup)) != 0) - return error; + error = kern_stat(td, path, UIO_SYSSPACE, &st); + free(path, M_TEMP); + if (error) + return (error); - if ((error = copyin(cup.ub, &st, sizeof st)) != 0) - return error; - bsd_to_svr4_stat64(&st, &svr4_st); if (S_ISSOCK(st.st_mode)) (void) svr4_add_socket(td, uap->path, &st); - if ((error = copyout(&svr4_st, uap->sb, sizeof svr4_st)) != 0) - return error; - - return 0; + return (copyout(&svr4_st, uap->sb, sizeof svr4_st)); } @@ -390,32 +327,24 @@ register struct thread *td; struct svr4_sys_lstat64_args *uap; { - struct stat st; - struct svr4_stat64 svr4_st; - struct stat_args cup; - int error; - caddr_t sg = stackgap_init(); + struct svr4_stat64 svr4_st; + struct stat st; + char *path; + int error; - CHECKALTEXIST(td, &sg, (char *) uap->path); + CHECKALTEXIST(td, uap->path, &path); - cup.path = uap->path; - cup.ub = stackgap_alloc(&sg, sizeof(struct stat)); + error = kern_lstat(td, path, UIO_SYSSPACE, &st); + free(path, M_TEMP); + if (error) + return (error); - if ((error = lstat(td, (struct lstat_args *)&cup)) != 0) - return error; - - if ((error = copyin(cup.ub, &st, sizeof st)) != 0) - return error; - bsd_to_svr4_stat64(&st, &svr4_st); if (S_ISSOCK(st.st_mode)) (void) svr4_add_socket(td, uap->path, &st); - if ((error = copyout(&svr4_st, uap->sb, sizeof svr4_st)) != 0) - return error; - - return 0; + return (copyout(&svr4_st, uap->sb, sizeof svr4_st)); } @@ -424,27 +353,15 @@ register struct thread *td; struct svr4_sys_fstat64_args *uap; { - struct stat st; - struct svr4_stat64 svr4_st; - struct fstat_args cup; - int error; - caddr_t sg = stackgap_init(); + struct svr4_stat64 svr4_st; + struct stat st; + int error; - cup.fd = uap->fd; - cup.sb = stackgap_alloc(&sg, sizeof(struct stat)); - - if ((error = fstat(td, &cup)) != 0) - return error; - - if ((error = copyin(cup.sb, &st, sizeof st)) != 0) - return error; - + error = kern_fstat(td, uap->fd, &st); + if (error) + return (error); bsd_to_svr4_stat64(&st, &svr4_st); - - if ((error = copyout(&svr4_st, uap->sb, sizeof svr4_st)) != 0) - return error; - - return 0; + return (copyout(&svr4_st, uap->sb, sizeof svr4_st)); } @@ -636,30 +553,26 @@ struct svr4_sys_utime_args *uap; { struct svr4_utimbuf ub; - struct timeval tbuf[2]; - struct utimes_args ap; + struct timeval tbuf[2], *tp; + char *path; int error; - caddr_t sg = stackgap_init(); - void *ttp; - - CHECKALTEXIST(td, &sg, uap->path); - ap.path = uap->path; + if (uap->ubuf != NULL) { - if ((error = copyin(uap->ubuf, &ub, sizeof(ub))) != 0) - return error; + error = copyin(uap->ubuf, &ub, sizeof(ub)); + if (error) + return (error); tbuf[0].tv_sec = ub.actime; tbuf[0].tv_usec = 0; tbuf[1].tv_sec = ub.modtime; tbuf[1].tv_usec = 0; - ttp = stackgap_alloc(&sg, sizeof(tbuf)); - error = copyout(tbuf, ttp, sizeof(tbuf)); - if (error) - return error; - ap.tptr = ttp; - } - else - ap.tptr = NULL; - return utimes(td, &ap); + tp = tbuf; + } else + tp = NULL; + + CHECKALTEXIST(td, uap->path, &path); + error = kern_utimes(td, path, UIO_SYSSPACE, tp, UIO_SYSSPACE); + free(path, M_TEMP); + return (error); } @@ -668,9 +581,13 @@ register struct thread *td; struct svr4_sys_utimes_args *uap; { - caddr_t sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->path); - return utimes(td, (struct utimes_args *)uap); + char *path; + int error; + + CHECKALTEXIST(td, uap->path, &path); + error = kern_utimes(td, path, UIO_SYSSPACE, uap->tptr, UIO_USERSPACE); + free(path, M_TEMP); + return (error); } static int @@ -727,22 +644,23 @@ register struct thread *td; struct svr4_sys_pathconf_args *uap; { - caddr_t sg = stackgap_init(); - register_t *retval = td->td_retval; + char *path; + int error, name; - CHECKALTEXIST(td, &sg, uap->path); + name = svr4_to_bsd_pathconf(uap->name); - uap->name = svr4_to_bsd_pathconf(uap->name); - - switch (uap->name) { + switch (name) { case -1: - *retval = -1; - return EINVAL; + td->td_retval[0] = -1; + return (EINVAL); case 0: - *retval = 0; - return 0; + td->td_retval[0] = 0; + return (0); default: - return pathconf(td, (struct pathconf_args *)uap); + CHECKALTEXIST(td, uap->path, &path); + error = kern_pathconf(td, path, UIO_SYSSPACE, name); + free(path, M_TEMP); + return (error); } } ==== //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#22 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.51 2005/01/05 22:34:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.52 2005/02/07 21:53:42 jhb Exp $"); #define COMPAT_43 1 @@ -80,7 +80,7 @@ #include /* Utils */ -static int clean_pipe(struct thread *, const char *); +static int clean_pipe(struct thread *, char *); static void getparm(struct file *, struct svr4_si_sockparms *); static int svr4_do_putmsg(struct thread *, struct svr4_sys_putmsg_args *, struct file *); @@ -509,48 +509,26 @@ static int clean_pipe(td, path) struct thread *td; - const char *path; + char *path; { - struct lstat_args la; - struct unlink_args ua; struct stat st; int error; - caddr_t sg = stackgap_init(); - size_t l = strlen(path) + 1; - void *tpath; - if ((tpath = stackgap_alloc(&sg, l)) == NULL) - return ENAMETOOLONG; - la.ub = stackgap_alloc(&sg, sizeof(struct stat)); - - if ((error = copyout(path, tpath, l)) != 0) - return error; - - la.path = tpath; + error = kern_lstat(td, path, UIO_SYSSPACE, &st); - if ((error = lstat(td, &la)) != 0) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 8 00:37:01 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BFF516A4D0; Tue, 8 Feb 2005 00:37:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE1AE16A4CE for ; Tue, 8 Feb 2005 00:37:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48FF743D2D for ; Tue, 8 Feb 2005 00:37:00 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j180b0Co059904 for ; Tue, 8 Feb 2005 00:37:00 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j180atXa059834 for perforce@freebsd.org; Tue, 8 Feb 2005 00:36:55 GMT (envelope-from peter@freebsd.org) Date: Tue, 8 Feb 2005 00:36:55 GMT Message-Id: <200502080036.j180atXa059834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 70571 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2005 00:37:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=70571 Change 70571 by peter@peter_daintree on 2005/02/08 00:36:37 IFC @70570 Affected files ... .. //depot/projects/hammer/UPDATING#72 integrate .. //depot/projects/hammer/bin/ps/keyword.c#13 integrate .. //depot/projects/hammer/contrib/netcat/FREEBSD-Xlist#1 branch .. //depot/projects/hammer/contrib/netcat/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/contrib/netcat/atomicio.c#1 branch .. //depot/projects/hammer/contrib/netcat/nc.1#1 branch .. //depot/projects/hammer/contrib/netcat/netcat.c#1 branch .. //depot/projects/hammer/contrib/netcat/socks.c#1 branch .. //depot/projects/hammer/contrib/pf/man/pf.4#5 integrate .. //depot/projects/hammer/contrib/pf/man/pf.conf.5#7 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#47 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#30 integrate .. //depot/projects/hammer/etc/rc.d/power_profile#5 integrate .. //depot/projects/hammer/games/fortune/datfiles/Makefile#5 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#37 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#21 delete .. //depot/projects/hammer/games/fortune/datfiles/fortunes2-o#9 integrate .. //depot/projects/hammer/games/fortune/tools/do_sort#2 integrate .. //depot/projects/hammer/games/fortune/tools/do_uniq.py#1 branch .. //depot/projects/hammer/include/Makefile#37 integrate .. //depot/projects/hammer/lib/Makefile#47 integrate .. //depot/projects/hammer/lib/libc/alpha/_fpmath.h#4 integrate .. //depot/projects/hammer/lib/libc/amd64/_fpmath.h#9 integrate .. //depot/projects/hammer/lib/libc/arm/_fpmath.h#2 integrate .. //depot/projects/hammer/lib/libc/gen/fpclassify.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/isgreater.3#3 integrate .. //depot/projects/hammer/lib/libc/i386/_fpmath.h#4 integrate .. //depot/projects/hammer/lib/libc/ia64/_fpmath.h#4 integrate .. //depot/projects/hammer/lib/libc/include/fpmath.h#3 integrate .. //depot/projects/hammer/lib/libc/powerpc/_fpmath.h#6 integrate .. //depot/projects/hammer/lib/libc/sparc64/_fpmath.h#4 integrate .. //depot/projects/hammer/lib/libgpib/Makefile#1 branch .. //depot/projects/hammer/lib/libgpib/gpib.h#1 branch .. //depot/projects/hammer/lib/libgpib/ibfoo.c#1 branch .. //depot/projects/hammer/lib/libnetgraph/msg.c#4 integrate .. //depot/projects/hammer/lib/msun/Makefile#22 integrate .. //depot/projects/hammer/lib/msun/alpha/Makefile.inc#1 branch .. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#1 branch .. //depot/projects/hammer/lib/msun/amd64/e_sqrt.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/Makefile.inc#1 branch .. //depot/projects/hammer/lib/msun/i387/e_acos.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_asin.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_atan2.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_atan2f.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_exp.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_fmod.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_log.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_log10.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_log10f.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_logf.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_remainder.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_remainderf.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_scalb.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_scalbf.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_sqrt.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/e_sqrtf.S#2 integrate .. //depot/projects/hammer/lib/msun/ia64/Makefile.inc#1 branch .. //depot/projects/hammer/lib/msun/src/e_acos.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_acosh.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_asin.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_atan2.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_atanh.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_cosh.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_exp.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_fmod.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_gamma.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_gamma_r.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_hypot.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_j0.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_j1.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_jn.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_lgamma.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_lgamma_r.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_log.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_log10.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_pow.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_remainder.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_scalb.c#5 integrate .. //depot/projects/hammer/lib/msun/src/e_sinh.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_sqrt.c#3 integrate .. //depot/projects/hammer/lib/msun/src/k_cos.c#2 integrate .. //depot/projects/hammer/lib/msun/src/k_rem_pio2.c#2 integrate .. //depot/projects/hammer/lib/msun/src/k_sin.c#2 integrate .. //depot/projects/hammer/lib/msun/src/k_standard.c#2 delete .. //depot/projects/hammer/lib/msun/src/k_tan.c#4 integrate .. //depot/projects/hammer/lib/msun/src/math.h#26 integrate .. //depot/projects/hammer/lib/msun/src/math_private.h#5 integrate .. //depot/projects/hammer/lib/msun/src/s_lib_version.c#2 delete .. //depot/projects/hammer/lib/msun/src/s_matherr.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_acos.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_acosf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_acosh.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_acoshf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_asin.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_asinf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_atan2.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_atan2f.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_atanh.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_atanhf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_cosh.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_coshf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_exp.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_expf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_fmod.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_fmodf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_gamma.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_gamma_r.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_gammaf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_gammaf_r.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_hypot.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_hypotf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_j0.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_j0f.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_j1.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_j1f.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_jn.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_jnf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_lgamma.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_lgamma_r.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_lgammaf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_lgammaf_r.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_log.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_log10.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_log10f.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_logf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_pow.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_powf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_remainder.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_remainderf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_scalb.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_scalbf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_sinh.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_sinhf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_sqrt.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_sqrtf.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_y0.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_y0f.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_y1.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_y1f.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_yn.c#2 delete .. //depot/projects/hammer/lib/msun/src/w_ynf.c#2 delete .. //depot/projects/hammer/libexec/rtld-elf/libmap.c#14 integrate .. //depot/projects/hammer/libexec/rtld-elf/libmap.h#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.1#8 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#25 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#70 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#20 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#22 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#13 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#37 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#38 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#33 integrate .. //depot/projects/hammer/share/man/man4/Makefile#62 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#31 integrate .. //depot/projects/hammer/share/man/man4/altq.4#7 integrate .. //depot/projects/hammer/share/man/man4/amr.4#10 integrate .. //depot/projects/hammer/share/man/man4/mac_biba.4#7 integrate .. //depot/projects/hammer/share/man/man4/mac_ifoff.4#6 integrate .. //depot/projects/hammer/share/man/man4/mac_partition.4#6 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#27 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/el.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/oltr.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_async.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_atm.4#9 integrate .. //depot/projects/hammer/share/man/man4/ng_atmpif.4#7 integrate .. //depot/projects/hammer/share/man/man4/ng_bpf.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_cisco.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_eiface.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_etf.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_hole.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_iface.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_ipfw.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_ksocket.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_l2tp.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_lmi.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_netflow.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_ppp.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_pppoe.4#7 integrate .. //depot/projects/hammer/share/man/man4/ng_pptpgre.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_socket.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_source.4#6 integrate .. //depot/projects/hammer/share/man/man4/ng_sppp.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_tee.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_tty.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_uni.4#8 integrate .. //depot/projects/hammer/share/man/man4/ng_vjc.4#6 integrate .. //depot/projects/hammer/share/man/man4/ng_vlan.4#3 integrate .. //depot/projects/hammer/share/man/man4/sn.4#3 integrate .. //depot/projects/hammer/share/man/man4/txp.4#5 integrate .. //depot/projects/hammer/share/man/man4/ums.4#4 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#33 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#49 integrate .. //depot/projects/hammer/share/man/man7/ports.7#13 integrate .. //depot/projects/hammer/share/man/man9/Makefile#48 integrate .. //depot/projects/hammer/share/man/man9/alq.9#4 integrate .. //depot/projects/hammer/share/man/man9/g_data.9#7 integrate .. //depot/projects/hammer/share/man/man9/mac.9#9 integrate .. //depot/projects/hammer/share/man/man9/timeout.9#9 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#32 integrate .. //depot/projects/hammer/sys/alpha/isa/isa_dma.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#113 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#121 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#53 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#16 integrate .. //depot/projects/hammer/sys/arm/arm/machdep.c#8 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#15 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#11 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#25 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#16 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.c#8 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_fcntl.c#7 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ipc.c#5 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#19 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stat.c#7 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#14 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#14 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_util.h#4 integrate .. //depot/projects/hammer/sys/conf/Makefile.powerpc#10 integrate .. //depot/projects/hammer/sys/conf/NOTES#80 integrate .. //depot/projects/hammer/sys/conf/files#103 integrate .. //depot/projects/hammer/sys/conf/files.i386#49 integrate .. //depot/projects/hammer/sys/conf/files.pc98#40 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#43 integrate .. //depot/projects/hammer/sys/conf/options#66 integrate .. //depot/projects/hammer/sys/conf/options.pc98#28 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr_isa.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr_pci.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltrvar.h#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi.c#53 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#28 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_package.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_perf.c#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi_throttle.c#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#38 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#43 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#16 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#15 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.h#6 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbusvar.h#6 integrate .. //depot/projects/hammer/sys/dev/cpufreq/ichss.c#1 branch .. //depot/projects/hammer/sys/dev/em/if_em.c#38 integrate .. //depot/projects/hammer/sys/dev/fe/mb86960.h#1 branch .. //depot/projects/hammer/sys/dev/ic/i8237.h#2 integrate .. //depot/projects/hammer/sys/dev/ieee488/ibfoo_int.h#1 branch .. //depot/projects/hammer/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/hammer/sys/dev/ieee488/ugpib.h#1 branch .. //depot/projects/hammer/sys/dev/ieee488/upd7210.c#1 branch .. //depot/projects/hammer/sys/dev/ieee488/upd7210.h#1 branch .. //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#12 integrate .. //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#11 integrate .. //depot/projects/hammer/sys/dev/owi/if_owi_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#30 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#33 integrate .. //depot/projects/hammer/sys/dev/random/probe.c#2 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#15 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#44 integrate .. //depot/projects/hammer/sys/dev/streams/streams.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/hid.c#6 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#16 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#15 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#17 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#22 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#10 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#60 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#11 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#46 integrate .. //depot/projects/hammer/sys/i386/i386/p4tcc.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#66 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_fcntl.c#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#12 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_msg.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_other.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_stat.c#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_util.c#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_util.h#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#19 integrate .. //depot/projects/hammer/sys/i386/isa/isa_dma.c#7 integrate .. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#16 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#21 integrate .. //depot/projects/hammer/sys/ia64/conf/NOTES#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#47 integrate .. //depot/projects/hammer/sys/ia64/isa/isa_dma.c#5 integrate .. //depot/projects/hammer/sys/isa/isavar.h#6 integrate .. //depot/projects/hammer/sys/kern/cpufreq_if.m#1 branch .. //depot/projects/hammer/sys/kern/kern_cpu.c#1 branch .. //depot/projects/hammer/sys/kern/kern_descrip.c#44 integrate .. //depot/projects/hammer/sys/kern/kern_idle.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#18 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#55 integrate .. //depot/projects/hammer/sys/kern/sysv_msg.c#13 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#49 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#34 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#49 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#72 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#41 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#15 integrate .. //depot/projects/hammer/sys/libkern/gets.c#1 branch .. //depot/projects/hammer/sys/libkern/strlcat.c#3 integrate .. //depot/projects/hammer/sys/libkern/strlcpy.c#3 integrate .. //depot/projects/hammer/sys/modules/Makefile#66 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#19 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_perf/Makefile#1 branch .. //depot/projects/hammer/sys/modules/cpufreq/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/Makefile#15 integrate .. //depot/projects/hammer/sys/modules/netgraph/ipfw/Makefile#1 branch .. //depot/projects/hammer/sys/modules/oltr/Makefile#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#12 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_atm.c#12 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#15 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#15 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.h#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_gif.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#16 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.h#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_ipfw.c#1 branch .. //depot/projects/hammer/sys/netgraph/ng_ipfw.h#1 branch .. //depot/projects/hammer/sys/netgraph/ng_message.h#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_sample.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#13 integrate .. //depot/projects/hammer/sys/netgraph/ng_sppp.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_sppp.h#3 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#20 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#50 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#11 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#38 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#24 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#22 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_nfsiod.c#11 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#39 integrate .. //depot/projects/hammer/sys/pc98/pc98/isa_dma.c#5 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#34 integrate .. //depot/projects/hammer/sys/powerpc/include/bus.h#10 integrate .. //depot/projects/hammer/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/hammer/sys/powerpc/include/spr.h#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/clock.c#8 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/cpu.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#32 integrate .. //depot/projects/hammer/sys/sparc64/isa/isa_dma.c#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#37 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#32 integrate .. //depot/projects/hammer/sys/sys/callout.h#5 integrate .. //depot/projects/hammer/sys/sys/cpu.h#1 branch .. //depot/projects/hammer/sys/sys/libkern.h#9 integrate .. //depot/projects/hammer/sys/sys/param.h#52 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#15 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#23 integrate .. //depot/projects/hammer/sys/sys/systm.h#30 integrate .. //depot/projects/hammer/sys/sys/vnode.h#45 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#19 integrate .. //depot/projects/hammer/tools/tools/recoverdisk/README#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/releng_4.rc#6 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/update_releng_4.rc#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/www/index.cgi#11 integrate .. //depot/projects/hammer/usr.bin/indent/indent.1#5 integrate .. //depot/projects/hammer/usr.bin/make/arch.c#11 integrate .. //depot/projects/hammer/usr.bin/make/buf.c#7 integrate .. //depot/projects/hammer/usr.bin/make/buf.h#6 integrate .. //depot/projects/hammer/usr.bin/make/compat.c#14 integrate .. //depot/projects/hammer/usr.bin/make/cond.c#14 integrate .. //depot/projects/hammer/usr.bin/make/dir.c#13 integrate .. //depot/projects/hammer/usr.bin/make/dir.h#8 integrate .. //depot/projects/hammer/usr.bin/make/for.c#12 integrate .. //depot/projects/hammer/usr.bin/make/job.c#19 integrate .. //depot/projects/hammer/usr.bin/make/main.c#26 integrate .. //depot/projects/hammer/usr.bin/make/make.c#11 integrate .. //depot/projects/hammer/usr.bin/make/nonints.h#11 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#22 integrate .. //depot/projects/hammer/usr.bin/make/str.c#11 integrate .. //depot/projects/hammer/usr.bin/make/suff.c#13 integrate .. //depot/projects/hammer/usr.bin/make/targ.c#12 integrate .. //depot/projects/hammer/usr.bin/make/targ.h#2 integrate .. //depot/projects/hammer/usr.bin/make/util.c#4 integrate .. //depot/projects/hammer/usr.bin/make/util.h#2 integrate .. //depot/projects/hammer/usr.bin/make/var.c#18 integrate .. //depot/projects/hammer/usr.bin/make/var.h#5 integrate .. //depot/projects/hammer/usr.bin/make/var_modify.c#7 integrate .. //depot/projects/hammer/usr.bin/nc/Makefile#1 branch .. //depot/projects/hammer/usr.bin/newkey/extern.h#2 integrate .. //depot/projects/hammer/usr.bin/newkey/newkey.c#2 integrate .. //depot/projects/hammer/usr.bin/newkey/update.c#2 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_tblout.c#2 integrate .. //depot/projects/hammer/usr.bin/tail/forward.c#7 integrate .. //depot/projects/hammer/usr.sbin/Makefile#60 integrate .. //depot/projects/hammer/usr.sbin/flowctl/flowctl.c#3 integrate .. //depot/projects/hammer/usr.sbin/mptable/mptable.c#4 integrate .. //depot/projects/hammer/usr.sbin/ngctl/main.c#7 integrate .. //depot/projects/hammer/usr.sbin/rpc.lockd/lock_proc.c#7 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#24 integrate .. //depot/projects/hammer/usr.sbin/tcpdrop/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/tcpdrop/tcpdrop.8#1 branch .. //depot/projects/hammer/usr.sbin/tcpdrop/tcpdrop.c#1 branch Differences ... ==== //depot/projects/hammer/UPDATING#72 (text+ko) ==== @@ -8,8 +8,6 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. Important recent entries: 20040724 (default X changes). -[[ The UPDATING file will be trimmed to 20040814 on or about Oct 1, 2004 ]] - NOTE TO PEOPLE WHO THINK THAT FreeBSD 6.x IS SLOW: FreeBSD 6.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect @@ -23,6 +21,16 @@ developers choose to disable these features on build machines to maximize performance. +20050206: + The cpufreq import is complete. As part of this, the sysctls for + acpi(4) throttling have been removed. The power_profile(8) script + has been updated, so you can use performance/economy_cpu_freq in + rc.conf(5) to set AC on/offline cpu frequencies. The acpi + throttling support has been merged into acpi_perf(4). + +20050206: + NG_VERSION has been increased. Recompiling kernel (or ng_socket.ko) + requires recompiling libnetgraph and userland netgraph utilities. 20050114: Support for abbreviated forms of a number of ipfw options is @@ -79,6 +87,9 @@ may need to insert a "/sbin/mount -u -o rw /dev/md0 /" in their /etc/rc scripts. +20041104: + FreeBSD 5.3 shipped here. + 20041102: The size of struct tcpcb has changed again due to the removal of RFC1644 T/TCP. You have to recompile userland programs that @@ -89,1691 +100,14 @@ userland programs that read kmem for tcp sockets directly (netstat, sockstat, etc.) -20041007: - The FreeBSD keyword is no longer a requirement for a valid - rc.d script. The rc(8) and rc.shutdown(8) scripts no longer check - for the existence of this keyword when ordering rc.d scripts. - This change touches most of the file in /etc/rc.d; therefore, - if you have not modified any files in that directory it may - be easier to rm -rf /etc/rc.d and then use the -i switch with - mergemaster(8). - -20041007: - One of the syscalls the 1:1 threading library libthr uses has - changed, thus breaking ABI compatibility. Make sure you rebuild - this library with the kernel. - -20041004: - A major sweep over the tty drivers to elimnate approx 3100 - lines of copy&pasted code have been performed. As a part of - this change some tty devices have changed names: - sio devices are now named: {tty,cua}d%d[.init,.lock] - ucom devices are now named: {tty,cua}U%d[.init,.lock] - For other drivers see the commit logs. - -20041001: - The following libraries had their version number bumped up: - /lib/libm.so.2 -> libm.so.3 - /lib/libreadline.so.4 -> libreadline.so.5 - /usr/lib/libhistory.so.4 -> libhistory.so.5 - /usr/lib/libopie.so.2 -> libopie.so.3 - /usr/lib/libpcap.so.2 -> libpcap.so.3 - FreeBSD 4.10 versions of these libraries will be added to the - compat4x collection. If you expect to be able to run old 4.X - executables you will need to remove the old versions of these - libraries. However note that any 5.X executables you have built - will stop working once you remove those old libraries. You should - have all your ports/packages rebuilt before removing the old - libraries. - -20040929: - The pfil API has gained an additional argument to pass an inpcb. - You should rebuild all pfil consuming modules: ipfw, ipfilter - and pf. - -20040928: - If named is enabled, the default is now to run it in a chroot - "sandbox." For users with existing configurations in - /etc/namedb the migration should be simple. Upgrade your - world as usual, then after installworld but before - mergemaster do the following: - - If named is running: /etc/rc.d/named stop - cd /etc - mv namedb namedb.bak - mkdir -p /var/named/etc/namedb - cp -Rp namedb.bak/* /var/named/etc/namedb/ - mergemaster (with your usual options) - If using the generated localhost* files: - cd /var/named/etc/namedb - /bin/sh make-localhost - rm -f localhost-v6.rev localhost.rev - /etc/rc.d/syslogd restart - /etc/rc.d/named start - - If you are using a custom configuration, or if you have - customised the named_* variables in /etc/rc.conf[.local] - then you may have to adjust the instructions accordingly. - It is suggested that you carefully examine the new named - variables in /etc/defaults/rc.conf and the options in - /var/named/etc/namedb/named.conf to see if they might - now be more suitable. - -20040925: - BIND 9 has been imported into the base, and is now fully - functional. BIND 8 has now been removed. There are numerous - differences between BIND 8 and 9, and users with critical - named installations should read the migration documentation - in /usr/share/doc/bind9/misc/migration. There is also a - new instruction manual in /usr/share/doc/bind9/arm. - - The key differences that most users will experience are in - how picky BIND 9 is about zone file format. If you are using - named as a resolving (caching) name server, you will likely - not have trouble. - - The following files are part of the old BIND 8 installation - and should be removed: - /usr/bin/dnskeygen /usr/bin/dnsquery /usr/libexec/named-xfer - /usr/sbin/named.restart /usr/sbin/ndc - - The following files have moved to /usr/bin, and should be - removed from their old locations: - /usr/sbin/nslookup /usr/sbin/nsupdate - -20040914: - The format of the pflogd(8) logfile "/var/log/pflog" has changed for - architectures that have a 64 bit long type to make it compatible to - the standard pcap format. In order to prevent corruption move away - any old logfile before using a new pflogd(8). - -20040906: - debug.witness_* has been renamed to debug.witness.*. There are - compatibility tunables left in for a few days. Update loader.conf - as necessary. - -20040902: - The ifi_epoch change has been reverted because the ABI breakage - was too extensive. If you are running with a kernel/userland - containing the initial change (20040830), you should heed the - warning about ifconfig incompatibility when upgrading again. - With this change, 5.3 and 6.0 ifconfigs and kernels are once - again interoperable. - -20040830: - A new variable, ifi_epoch, has been added to struct if_data - which is part if struct ifnet. This means all network drivers - and network monitoring applications need to be recompiled. - - WARNING WARNING WARNING WARNING WARNING WARNING WARNING - - This also breaks ifconfig compatibility. An old ifconfig will - not work with the new kernel and a new ifconfig will not work - with the old. It is strongly recommended that you make a copy - of your old ifconfig before installworld. If you are installing - remotely, you must copy over a new ifconfig before rebooting in - to the new kernel. - -20040828: - The default configuration for the network stack has been changed - such that it now runs without the Giant lock unless configured - otherwise. If you experience network-related instability, you - may wish to try setting "debug.mpsafenet=0" or compiling the - kernel with "options NET_WITH_GIANT". Details on the netperf - project may be found at: - - http://www.watson.org/~robert/freebsd/netperf/ - - Including the 20040828 announcement of configuration change - details. - -20040827: - PFIL_HOOKS are a fixed part of the network stack now and do not - need to be specified in the kernel configuration file anymore. - -20040819: - Netgraph changed its message format slightly to align the data - portion well on 64 bit machines. - Netgraph using utilities (e.g. ngctl, nghook, ppp, mpd, - pppoed, bluetooth, ATM) should be recompiled when a new kernel - is installed. - -20040817: - IPFW has been converted to use pfil(9). This change is - transparent to userland and preserves the ipfw ABI. The ipfw - core packet inspection and filtering functions have not been - changed, only how ipfw is invoked is different. - -20040814: - The RANDOM_IP_ID option has been replaced by the sysctl - net.inet.ip.random_id. If you had RANDOM_IP_ID in your kernel then - you may want to add "net.inet.ip.random_id=1" to /etc/sysctl.conf. - -20040807: - The size of 'struct ifnet' has changed due to the addition of the - if_carp placeholder. All kernel modules implementing network - interfaces must be recompiled as a result. - -20040806: - Module loading has been fixed. Some older installations will - drop proper module_path initialization and modules will fail to - load properly. If you have a line in /boot/loader.rc that says: - "initialize drop", do (i386 only): - cp /usr/src/sys/boot/i386/loader/loader.rc /boot/loader.rc - chown root:wheel /boot/loader.rc - chmod 444 /boot/loader.rc - -20040802: - making /dev/(null|zero) into a module proved to be too unpopular, - so this bit has been revoked from the previous (20040801) entry. - -20040801: - The /dev/mem, /dev/io /dev/(null/zero) devices are now modules, - so you may wish to add them to your kernel config file. See - GENERIC for examples. - -20040728: - System compiler has been upgraded to GCC 3.4.2-pre. As with any major - compiler upgrade, there are several issues to be aware of. GCC 3.4.x - has broken C++ ABI compatibility with previous releases yet again - and users will have to rebuild all their C++ programs with the new - compiler. If you are getting run-time error such as - /libexec/ld-elf.so.1: Undefined symbol "_ZNSs20_S_empty_rep_storageE" - This entry does apply to you. - - A new unit-at-a-time optimization mode, which is default in this - compiler release, is more aggressive in removing unused static - symbols. This is the likely cause of 'make buildworld' breakages - with non-default CFLAGS where optimization level is set to -O2 - or higher. - - With the upgrade of the system compiler, the kernel has been upgraded - to match the new system compiler. This makes it impossible to build - a new kernel with the old compiler. Upgrade your system via - make buildworld and make kernel (see below) to fix this problem. - -20040727: - The size of 'struct ifnet' has changed due to the addition of - the IFF_NEEDSGIANT flag (and what it implies). All kernel - modules implementing network interfaces must be recompiled as - a result. - -20040716: - The sound device drivers are renamed. `sound' is always required, - while `snd_*' should be configured accordingly to your hardware. - Refer to NOTES for the detail of the drivers. - -20040710: - __FreeBSD_version bumped to 502122. - -20040710: - The console initialization on Alpha has been reworked and is now - identical to other platforms. This means that the hardcoding of - the serial console and the debug port has been removed. As such, - hints (hint.sio.0.flags="0x10") are now required for the sio(4) - driver to become a console or debug port. The NO_SIO option has - been decommissioned because of this. - Running mergemaster is the easiest way to ensure your - 'boot/device.hints' has the needed line. - -20040710: - A revamp of the debugging code in the kernel with some visible - changes beyond just the debugging experience: - o The DDB option is now specific to the DDB debugger backend - and should not be used any more for conditional compilation - of debugging code for when debugging is enabled. Use the KDB - option for this. - o The WITNESS_DDB, DDB_TRACE and DDB_UNATTENDED options have - been renamed to WITNESS_KDB, KDB_TRACE and KDB_UNATTENDED - respectively. This is in line with the first bullet. - o The remote GDB support has been untangled from DDB and needs - to be enabled separately now. Use the GDB option for this. - o The GDB_REMOTE_CHAT option has been removed. Support for this - homegrown feature is discontinued. The GDB remote protocol - supports console output and it makes sense to use that. - o The DDB_NOKLDSYM option has been removed. The DDB debugger - now supports both direct symbol table lookups as well as KLD - symbol lookups through the linker. - -20040708: - Bluetooth code has been marked as non-i386 specific. - __FreeBSD_version has been bumped to 502121 to mark this change. - -20040702: - The native preemption has been added to the kernel scheduler. - There is some report that the ULE scheduler was broken in some - machines and we encourage users using the ULE scheduler either - stick with a known good kernel, or temporarily switch to the 4BSD - scheduler as a workaround. - -20040630: - The netgraph ABI version number has been incremented to indicate - an incompatible change in the ABI. Old netgraph nodes will refuse - to attach until recompiled. Netgraph now uses mbuf tags to move - metadata and this commit removes its home-grown metadata facility. - Nodes should just recompile, unless they use metadata, in which - case the changes are simple; the file ng_ksocket.c serves as an - example of such changes. - - This also broke i4b, although the compile problem has been papered - over. - -20040630: - ACPI has been updated to disable known-bad BIOS revisions. A message - will be printed on the console indicating that ACPI has been disabled - automatically and that the user should use a newer BIOS, if possible. - If you think ACPI does work on your system and want to override - this (i.e., for testing), set hint.acpi.0.disabled="0" at the - loader prompt. - -20040623: - pf was updated to OpenBSD-stable 3.5 and pflogd(8) is privilege - separated now. It uses the newly created "_pflogd" user/group - combination. If you plan to use pflogd(8) make sure to run - mergemaster -p or install the "_pflogd" user and group manually. - -20040622: - Network interface cloning has been overhauled. This change will - require a recompile of modules using cloning and modification of - external ones to the new API. __FreeBSD_version has been bumped - to 502119 to mark this change. Additionally, users creating - stf(4) interfaces via "ifconfig stf" will need to update their - scripts as this will create an interface named "stf" instead of - "stf0" and ifconfig will not print "stf0" to stdout. - -20040621: - On 20040524, the /etc/rc.d/nsswitch script was modified to - automatically create /etc/nsswitch.conf on startup if it did - not already exist. Unfortunately, an error in the man page - was carried over to the script, resulting in incorrect - nsswitch settings. The simplest remedy is to remove both - /etc/nsswitch.conf and /etc/host.conf; they will be recreated - during the next reboot. - -20040614: - The return value of sema_timedwait(9) has been changed to - make it consistent with cv_timedwait(9). Be sure to recompile - the ips module and any third-party modules which call - sema_timedwait. - -20040613: - ALTQ is now linked to the build. This breaks ABI for struct ifnet. - Make sure to recompile modules and any userland that makes use of - sizeof(struct ifnet). In order to get the altq headers in place - please recompile and reinstall world. - -20040607: - Splitting kern_thread.c into 2 files (adding kern_kse.c) - requires that you re-run config after updating your tree. - -20040601: - The MIDI drivers have been removed. Until the new module-friendly - ones are merged, remove or comment out midi and seq from your - kernel configuration. - -20040423: - Due to a new option in ipfw (versrcreach) the ipfw(8) command - needs to be recompiled. Normal accept/reject rules without - options are not affected but those with options may break until - ipfw(8) is recompiled. - -20040420: - Due to changes in the callout ABI, kernels compiled after this - date may be incompatible with kernel modules compiled prior to - 20040406. - -20040414: - The PCI bus power state stuff has been turned on. If this causes - problems for your system, please disable it using the tunable - hw.pci.do_powerstate=0. - -20040412: - The bulk of the pci problems have been fixed, although the floppy - drive is still broken. - -20040410: - A substantial update to the pci bus resource and power management - have been committed. Expect a bumpy ride for a few days until - the unanticipated problems have been resolved. - -20040409: - Due to changes in the the Yarrow initialization process, - /dev/random needs to be fed before operations requiring - temp files can succeed in single user mode. This includes - running "make installworld". /dev/random may be fed by running - "/etc/rc.d/initrandom start" or with 20040415 source by running - "/etc/rc.d/preseedrandom". - -20040322: - The debug.mpsafenet tunable controls whether the kernel Giant - lock is held across the lower levels of the network stack, and - by default is turned off. In the few days following 20040322, - the behavior of debug.mpsafenet will change such that this - tunable controls Giant over all levels of the network stack. - If you are currently setting debug.mpsafenet to 1, you should - set it back to 0 (the default) again during the change-over. - An additional note will be added to UPDATING when sufficient - locking is merged to permit this to take place. - -20040310: - The FreeBSD/sparc64 platform is changing time_t from 32-bits to - 64-bits. This is a very major incompatible change, so people - using FreeBSD/sparc64 *must* read the UPDATING.64BTT file for - detailed instructions on how to make this upgrade. People - upgrading FreeBSD on other platforms can ignore this event. - -20040308: - The packet filter (pf) is now installed with the base system. Make - sure to run mergemaster -p before installworld to create required - user account ("proxy"). If you do not want to build pf with your - system you can use the NO_PF knob in make.conf. - The pf system consists of the following three devices: - device pf # required - device pflog # optional - device pfsync # optional - -20040303: - If you are having trouble with the libc_r -> libpthread transition - (see the 20040130 entry), place the following lines at the top of - /etc/libmap.conf: - - libc_r.so.5 libpthread.so.1 - libc_r.so libpthread.so - - This will cause all programs and libraries linked against libc_r - to use libpthread instead. - -20040226: - Some sshd configuration defaults have changed: protocol version 1 - is no longer enabled by default, and password authentication is - disabled by default if PAM is enabled (which it is by default). - OpenSSH clients should not be affected by this; other clients may - have to be reconfigured, upgraded or replaced. - -20040225: - The ABIs defined in and have been updated - to support improved reentrancy. Multi-threaded programs that - reference the "_res" or "h_errno" symbols may experience some - problems if they are not recompiled. Single-threaded programs - should remain unaffected. - -20040225: - routed has been updated in the base system from the vendor - sources, routed v2.27, from rhyolite.com. This change means that - for users who use RIP's MD5 authentication feature, FreeBSD - -CURRENT's routed is now incompatible with previous versions - of FreeBSD; however it is now compatible with implementations - from Sun, Cisco and other vendors. - -20040224: - The tcpcb structure has changed and makes a recompile of libkvm - and related userland network utilities necessary. - -20040222: - The cdevsw structure has changed in two externally visible ways. - First, the sense of the D_GIANT flag has changed to D_NEEDSGIANT. - Second, the d_version field must be filled in with D_VERSION. - Drivers outside the tree will need to be updated. - -20040207: - The /etc/rc.d/ttys script has been removed. It is no longer - necessary since devfs has been mandatory for some time. - -20040130: - libkse has been renamed back to libpthread and is now the - default threads library. The gcc -pthread option has also - been changed to link to libpthread instead of libc_r. For - alpha and sparc64 machines, libkse is not renamed and links - are installed so that libpthread points to libc_r. Until - the ports system is updated to handle this change, it is - recommended that folks install an /etc/libmap.conf(5) that - maps libc_r to libpthread. If you have any binaries or - libraries linked to libkse, then it is also recommended - that you map libkse to libpthread. Anyone that is using - nvidia supplied drivers and libraries should use a libmap.conf - that maps libpthread to libc_r since their drivers/libraries - do not work with libpthread. - -20040125: - ULE has entered into its probationary period as the default scheduler - in GENERIC. For the average user, interactivity is reported to be - better in many cases. On SMP machines ULE will be able to make more - efficient use of the available parallel resources. If you are not - running it now, please switch over, replacing the kernel option - SCHED_4BSD with SCHED_ULE. - -20040125: - Move LongRun support out of identcpu.c, where it hardly - belongs, into its own file and make it opt-in, not mandatory, - depending on CPU_ENABLE_LONGRUN config(8) option. - -20031213: - src/lib/libc/gen/initgroups.c:1.8 now causes logins to fail - if the login process is unable to successfully set the - process credentials to include all groups defined for the - user. The current kernel limit is 16 groups; administrators - may wish to check that users do not have over 16 groups - defined, or they will be unable to log in. - -20031203: - The ACPI module has been reactivated. It is no longer required - to compile ACPI support into kernels statically. - -20031112: - The statfs structure has been updated with 64-bit fields to - allow accurate reporting of multi-terabyte filesystem - sizes. You should build world, then build and boot the new kernel - BEFORE doing a `installworld' as the new kernel will know about - binaries using the old statfs structure, but an old kernel will - not know about the new system calls that support the new statfs - structure. - Note that the backwards compatibility is only present when the - kernel is configured with the COMPAT_FREEBSD4 option. Since - even /bin/sh will not run with a new kernel without said option - you're pretty much dead in the water without it. Make sure you - have COMPAT_FREEBSD4! - Running an old kernel after a `make world' will cause programs - such as `df' that do a statfs system call to fail with a bad - system call. Marco Wertejuk also reports - that cfsd (ports/security/cfs) needs to be recompiled after - these changes are installed. - - ****************************DANGER******************************* - - DO NOT make installworld after the buildworld w/o building and - installing a new kernel FIRST. You will be unable to build a - new kernel otherwise on a system with new binaries and an old - kernel. - -20031112: - Some netgraph string length constants have been changed. This - change requires the netgraph kernel modules and all netgraph - userland components to be in sync. Especially users who require - netgraph to boot need to make sure to have world and kernel in - sync before rebooting. - -20031111: - Hyperthreading logical CPU's are no longer probed by default - when using the MP Table. If ACPI is being used, then logical - CPUs will be probed if hyperthreading is enabled in the BIOS. - If ACPI is not being used and hyperthreading is enabled in the - BIOS, logical CPUs can be enabled by building a custom kernel - with the option MPTABLE_FORCE_HTT enabled. - -20031103: - The i386 APIC_IO kernel option has been replaced by - 'device apic'. The ACPI module has also been temporarily - disabled, so ACPI must be statically compiled into your - kernel using 'device acpi' if you wish to use the ACPI driver. - -20031031: - The API and ABI of struct ifnet have been changed by removing - the if_name and if_unit members and replacing them with - if_xname, if_dname, and if_dunit. All network drivers and most - userland programs which include net/if_var.h must be updated - and recompiled. __FreeBSD_version has been bumped to 501113 to - reflect this change. - -20030928: - Changes to the cdevsw default functions have been made to remove - the need to specify nullopen() and nullclose() explicitly. - __FreeBSD_version bumped to 501110. - -20030926: - kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and - mount_cd9660(8) need to be in sync with kernel. - -20030923: - Fix a bug in arplookup(), whereby a hostile party on a locally - attached network could exhaust kernel memory, and cause a system - panic, by sending a flood of spoofed ARP requests. See - FreeBSD-SA-03:14.arp. - -20030915: - A change to /etc/defaults/rc.conf now causes inetd to be started - with `-C 60' if it is not overridden in /etc/rc.conf. This - causes inetd to stop accepting connections from an IP address >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 8 00:49:16 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C822916A4D0; Tue, 8 Feb 2005 00:49:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9DEE516A4CE for ; Tue, 8 Feb 2005 00:49:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8059543D1D for ; Tue, 8 Feb 2005 00:49:15 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j180nFZi074927 for ; Tue, 8 Feb 2005 00:49:15 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j180nFu6074922 for perforce@freebsd.org; Tue, 8 Feb 2005 00:49:15 GMT (envelope-from peter@freebsd.org) Date: Tue, 8 Feb 2005 00:49:15 GMT Message-Id: <200502080049.j180nFu6074922@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 70572 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2005 00:49:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=70572 Change 70572 by peter@peter_daintree on 2005/02/08 00:48:29 integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#114 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#54 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#30 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#17 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#114 (text+ko) ==== @@ -102,8 +102,11 @@ #endif #include +#include + #include +#include #include #include #include ==== //depot/projects/hammer/sys/amd64/conf/NOTES#54 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1178) +# (XXX from i386:NOTES,v 1.1179) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.21 2005/02/05 21:01:09 njl Exp $ # @@ -209,6 +209,9 @@ # Support for ACPI CPU Performance states via cpufreq(4) device acpi_perf +# The cpufreq(4) driver provides support for non-ACPI CPU frequency control +device cpufreq + # DRM options: # mgadrm: AGP Matrox G200, G400, G450, G550 # r128drm: ATI Rage 128 ==== //depot/projects/hammer/sys/amd64/isa/clock.c#30 (text+ko) ==== @@ -718,6 +718,7 @@ /* Reenable RTC updates and interrupts. */ writertc(RTC_STATUSB, rtc_statusb); + rtcin(RTC_INTR); } @@ -764,6 +765,7 @@ INTR_TYPE_CLK | INTR_FAST, NULL); writertc(RTC_STATUSB, rtc_statusb); + rtcin(RTC_INTR); } init_TSC_tc(); ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.c#17 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Feb 8 01:19:53 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B93C16A4D0; Tue, 8 Feb 2005 01:19:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EADEA16A4CE for ; Tue, 8 Feb 2005 01:19:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C014143D1F for ; Tue, 8 Feb 2005 01:19:52 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j181Jq6s099833 for ; Tue, 8 Feb 2005 01:19:52 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j181JqlE099827 for perforce@freebsd.org; Tue, 8 Feb 2005 01:19:52 GMT (envelope-from peter@freebsd.org) Date: Tue, 8 Feb 2005 01:19:52 GMT Message-Id: <200502080119.j181JqlE099827@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 70573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2005 01:19:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=70573 Change 70573 by peter@peter_daintree on 2005/02/08 01:19:49 make this build (no bootinfo.h, rtc.h included twice) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#115 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#115 (text+ko) ==== @@ -102,11 +102,8 @@ #endif #include -#include - #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Tue Feb 8 04:31:16 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B28316A4D1; Tue, 8 Feb 2005 04:31:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4248016A4CE for ; Tue, 8 Feb 2005 04:31:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C30743D39 for ; Tue, 8 Feb 2005 04:31:16 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j184VFkm078336 for ; Tue, 8 Feb 2005 04:31:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j184VFDT078333 for perforce@freebsd.org; Tue, 8 Feb 2005 04:31:15 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Feb 2005 04:31:15 GMT Message-Id: <200502080431.j184VFDT078333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 70580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2005 04:31:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=70580 Change 70580 by sam@sam_ebb on 2005/02/08 04:30:34 grr Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_input.c#5 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_input.c#5 (text+ko) ==== @@ -2253,12 +2253,12 @@ IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); IEEE80211_VERIFY_SSID(vap->iv_bss, ssid); - if ((ic->ic_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) { - IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, + if ((vap->iv_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, wh, ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT], "%s", "no ssid with ssid suppression enabled"); - ic->ic_stats.is_rx_ssidmismatch++; /*XXX*/ + vap->iv_stats.is_rx_ssidmismatch++; /*XXX*/ return; } From owner-p4-projects@FreeBSD.ORG Tue Feb 8 20:42:03 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F00B116A4D0; Tue, 8 Feb 2005 20:42:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD64B16A4CE for ; Tue, 8 Feb 2005 20:42:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9659B43D2D for ; Tue, 8 Feb 2005 20:42:02 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j18Kg2UD082042 for ; Tue, 8 Feb 2005 20:42:02 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j18Kg2tU082033 for perforce@freebsd.org; Tue, 8 Feb 2005 20:42:02 GMT (envelope-from trhodes@freebsd.org) Date: Tue, 8 Feb 2005 20:42:02 GMT Message-Id: <200502082042.j18Kg2tU082033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Subject: PERFORCE change 70654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2005 20:42:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=70654 Change 70654 by trhodes@trhodes_local on 2005/02/08 20:41:01 SYSCTL_IN() before we SYSCTL_OUT() Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#79 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#79 (text+ko) ==== @@ -152,27 +152,6 @@ if (index > MAC_BSDEXTENDED_MAXRULES) return (ENOENT); - if (req->oldptr) { - mtx_lock(&mac_bsdextended_mtx); - if (index < 0 || index > rule_slots + 1) { - mtx_unlock(&mac_bsdextended_mtx); - return (ENOENT); - } - - if (rules[index] == NULL) { - mtx_unlock(&mac_bsdextended_mtx); - return (ENOENT); - } - - temprule = *rules[index]; - mtx_unlock(&mac_bsdextended_mtx); - - error = SYSCTL_OUT(req, &temprule, sizeof(temprule)); - - if (error) - return (error); - } - if (req->newptr) { if (req->newlen == 0) { /* printf("deletion\n"); */ @@ -213,6 +192,29 @@ *rules[index] = temprule; } mtx_unlock(&mac_bsdextended_mtx); + return 0; + } + + + if (req->oldptr) { + mtx_lock(&mac_bsdextended_mtx); + if (index < 0 || index > rule_slots + 1) { + mtx_unlock(&mac_bsdextended_mtx); + return (ENOENT); + } + + if (rules[index] == NULL) { + mtx_unlock(&mac_bsdextended_mtx); + return (ENOENT); + } + + temprule = *rules[index]; + mtx_unlock(&mac_bsdextended_mtx); + + error = SYSCTL_OUT(req, &temprule, sizeof(temprule)); + + if (error) + return (error); } return (0); From owner-p4-projects@FreeBSD.ORG Wed Feb 9 16:08:55 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3281D16A4D0; Wed, 9 Feb 2005 16:08:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E614A16A4CE for ; Wed, 9 Feb 2005 16:08:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D07EB43D2F for ; Wed, 9 Feb 2005 16:08:54 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j19G8shG090385 for ; Wed, 9 Feb 2005 16:08:54 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j19G8sMu090382 for perforce@freebsd.org; Wed, 9 Feb 2005 16:08:54 GMT (envelope-from trhodes@freebsd.org) Date: Wed, 9 Feb 2005 16:08:54 GMT Message-Id: <200502091608.j19G8sMu090382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Subject: PERFORCE change 70703 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Feb 2005 16:08:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=70703 Change 70703 by trhodes@trhodes_local on 2005/02/09 16:08:16 Some style and grammar changes. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#80 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#80 (text+ko) ==== @@ -99,7 +99,7 @@ &rule_slots, 0, "Number of used rule slots\n"); /* - * This is just used for logging purposes as eventually we would like + * This is just used for logging purposes, eventually we would like * to log much more then failed requests. */ static int mac_bsdextended_logging; @@ -192,10 +192,9 @@ *rules[index] = temprule; } mtx_unlock(&mac_bsdextended_mtx); - return 0; + return (0); } - if (req->oldptr) { mtx_lock(&mac_bsdextended_mtx); if (index < 0 || index > rule_slots + 1) { @@ -311,8 +310,8 @@ return (EACCES); /* Matching rule denies access */ } /* - * If the rule matched and allowed access and first match is - * enabled, then return success. + * If the rule matched, permits access, and first match is + * enabled, return success. */ if (mac_bsdextended_firstmatch_enabled) return (EJUSTRETURN); @@ -335,7 +334,7 @@ continue; /* - * Since we don't separately handle append, map append to + * Since we do not separately handle append, map append to * write. */ if (acc_mode & MBI_APPEND) { From owner-p4-projects@FreeBSD.ORG Wed Feb 9 19:59:39 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34FBE16A4D1; Wed, 9 Feb 2005 19:59:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C29CD16A4CE for ; Wed, 9 Feb 2005 19:59:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9664C43D31 for ; Wed, 9 Feb 2005 19:59:38 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j19Jxceo008397 for ; Wed, 9 Feb 2005 19:59:38 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j19JxcsR008394 for perforce@freebsd.org; Wed, 9 Feb 2005 19:59:38 GMT (envelope-from areisse@nailabs.com) Date: Wed, 9 Feb 2005 19:59:38 GMT Message-Id: <200502091959.j19JxcsR008394@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 70717 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Feb 2005 19:59:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=70717 Change 70717 by areisse@areisse_tislabs on 2005/02/09 19:58:40 Use a 32-bit access_vector_t (like selinux). With this change, libsepol becomes practically identical to the selinux version. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/avtab.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/flask_types.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/avtab.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/write.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/avtab.h#3 (text+ko) ==== @@ -26,7 +26,6 @@ #include #include -#include typedef struct avtab_key { uint32_t source_type; /* source type */ @@ -45,7 +44,7 @@ #define AVTAB_TYPE (AVTAB_TRANSITION | AVTAB_MEMBER | AVTAB_CHANGE) #define AVTAB_ENABLED 0x80000000 /* reserved for used in cond_avtab */ uint32_t specified; /* what fields are specified */ - access_vector_t data[3]; /* access vectors or types */ + uint32_t data[3]; /* access vectors or types */ #define avtab_allowed(x) (x)->data[0] #define avtab_auditdeny(x) (x)->data[1] #define avtab_auditallow(x) (x)->data[2] ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/flask_types.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * for permissions are defined in the automatically generated * header file av_permissions.h. */ -typedef uint64_t access_vector_t; +typedef uint32_t access_vector_t; /* * Each object class is identified by a fixed-size value. ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/avtab.c#3 (text+ko) ==== @@ -362,21 +362,12 @@ return -1; } if (avdatum->specified & AVTAB_AV) { - if (avdatum->specified & AVTAB_ALLOWED) { - uint32_t b1 = le32_to_cpu (buf[items++]); - uint32_t b2 = le32_to_cpu (buf[items++]); - avtab_allowed(avdatum) = (((uint64_t) b1) << 32) | b2; - } - if (avdatum->specified & AVTAB_AUDITDENY) { - uint32_t b1 = le32_to_cpu (buf[items++]); - uint32_t b2 = le32_to_cpu (buf[items++]); - avtab_auditdeny(avdatum) = (((uint64_t) b1) << 32) | b2; - } - if (avdatum->specified & AVTAB_AUDITALLOW) { - uint32_t b1 = le32_to_cpu (buf[items++]); - uint32_t b2 = le32_to_cpu (buf[items++]); - avtab_auditallow(avdatum) = (((uint64_t) b1) << 32) | b2; - } + if (avdatum->specified & AVTAB_ALLOWED) + avtab_allowed(avdatum) = le32_to_cpu(buf[items++]); + if (avdatum->specified & AVTAB_AUDITDENY) + avtab_auditdeny(avdatum) = le32_to_cpu(buf[items++]); + if (avdatum->specified & AVTAB_AUDITALLOW) + avtab_auditallow(avdatum) = le32_to_cpu(buf[items++]); } else { if (avdatum->specified & AVTAB_TRANSITION) avtab_transition(avdatum) = le32_to_cpu(buf[items++]); ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/write.c#3 (text+ko) ==== @@ -107,18 +107,12 @@ return -1; } if (cur->datum.specified & AVTAB_AV) { - if (cur->datum.specified & AVTAB_ALLOWED) { - buf[items++] = cpu_to_le32(avtab_allowed(&cur->datum) >> 32); - buf[items++] = cpu_to_le32(avtab_allowed(&cur->datum) & 0xffffffff); - } - if (cur->datum.specified & AVTAB_AUDITDENY) { - buf[items++] = cpu_to_le32(avtab_auditdeny(&cur->datum) >> 32); - buf[items++] = cpu_to_le32(avtab_auditdeny(&cur->datum) & 0xffffffff); - } - if (cur->datum.specified & AVTAB_AUDITALLOW) { - buf[items++] = cpu_to_le32(avtab_auditallow(&cur->datum) >> 32); - buf[items++] = cpu_to_le32(avtab_auditallow(&cur->datum) & 0xffffffff); - } + if (cur->datum.specified & AVTAB_ALLOWED) + buf[items++] = cpu_to_le32(avtab_allowed(&cur->datum)); + if (cur->datum.specified & AVTAB_AUDITDENY) + buf[items++] = cpu_to_le32(avtab_auditdeny(&cur->datum)); + if (cur->datum.specified & AVTAB_AUDITALLOW) + buf[items++] = cpu_to_le32(avtab_auditallow(&cur->datum)); } else { if (cur->datum.specified & AVTAB_TRANSITION) buf[items++] = cpu_to_le32(avtab_transition(&cur->datum)); From owner-p4-projects@FreeBSD.ORG Wed Feb 9 20:08:51 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B8AF16A4D0; Wed, 9 Feb 2005 20:08:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2735016A4CE for ; Wed, 9 Feb 2005 20:08:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1F8743D48 for ; Wed, 9 Feb 2005 20:08:50 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j19K8oPs009064 for ; Wed, 9 Feb 2005 20:08:50 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j19K8o15009061 for perforce@freebsd.org; Wed, 9 Feb 2005 20:08:50 GMT (envelope-from areisse@nailabs.com) Date: Wed, 9 Feb 2005 20:08:50 GMT Message-Id: <200502092008.j19K8o15009061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 70719 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Feb 2005 20:08:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=70719 Change 70719 by areisse@areisse_tislabs on 2005/02/09 20:07:57 Remove usused capabilities (CAP_MAC_*, CAP_INF_*, CAP_LINK_DIR) and renumber some of the others so that there are less than 32 and the masks all fit in a uint32_t. Use a 32-bit access_vector_t. This makes the binary policy format compatible with selinux (versions 15-18). Old FreeBSD policies are not compatible with this change, and must be rebuilt with either an updated sebsd_checkpolicy, or checkpolicy from selinux. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_cap.c#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask_types.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/avtab.c#7 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/capability.h#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_cap.c#8 (text+ko) ==== @@ -58,38 +58,16 @@ return ("CAP_FSETID"); case CAP_KILL: return ("CAP_KILL"); - case CAP_LINK_DIR: - return ("CAP_LINK_DIR"); case CAP_SETFCAP: return ("CAP_SETFCAP"); case CAP_SETGID: return ("CAP_SETGID"); case CAP_SETUID: return ("CAP_SETUID"); - case CAP_MAC_DOWNGRADE: - return ("CAP_MAC_DOWNGRADE"); - case CAP_MAC_READ: - return ("CAP_MAC_READ"); - case CAP_MAC_RELABEL_SUBJ: - return ("CAP_MAC_RELABEL_SUBJ"); - case CAP_MAC_UPGRADE: - return ("CAP_MAC_UPGRADE"); - case CAP_MAC_WRITE: - return ("CAP_MAC_WRITE"); - case CAP_INF_NOFLOAT_OBJ: - return ("CAP_INF_NOFLOAT_OBJ"); - case CAP_INF_NOFLOAT_SUBJ: - return ("CAP_INF_NOFLOAT_SUBJ"); - case CAP_INF_RELABEL_OBJ: - return ("CAP_INF_RELABEL_OBJ"); - case CAP_INF_RELABEL_SUBJ: - return ("CAP_INF_RELABEL_SUBJ"); case CAP_AUDIT_CONTROL: return ("CAP_AUDIT_CONTROL"); case CAP_AUDIT_WRITE: return ("CAP_AUDIT_WRITE"); - case CAP_SETPCAP: - return ("CAP_SETPCAP"); case CAP_SYS_SETFFLAG: return ("CAP_SYS_SETFFLAG"); case CAP_NET_BIND_SERVICE: ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask_types.h#6 (text+ko) ==== @@ -56,7 +56,7 @@ * for permissions are defined in the automatically generated * header file av_permissions.h. */ -typedef u64 access_vector_t; +typedef u32 access_vector_t; /* * Each object class is identified by a fixed-size value. ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/avtab.c#7 (text+ko) ==== @@ -336,23 +336,15 @@ printk(KERN_ERR "security: avtab: entry has both access vectors and types\n"); goto bad; } + + if (avdatum->specified & AVTAB_AV) { - - if (avdatum->specified & AVTAB_ALLOWED) { - u32 b1 = le32_to_cpu (buf[items++]); - u32 b2 = le32_to_cpu (buf[items++]); - avtab_allowed(avdatum) = (((u64) b1) << 32) | b2; - } - if (avdatum->specified & AVTAB_AUDITDENY) { - u32 b1 = le32_to_cpu (buf[items++]); - u32 b2 = le32_to_cpu (buf[items++]); - avtab_auditdeny(avdatum) = (((u64) b1) << 32) | b2; - } - if (avdatum->specified & AVTAB_AUDITALLOW) { - u32 b1 = le32_to_cpu (buf[items++]); - u32 b2 = le32_to_cpu (buf[items++]); - avtab_auditallow(avdatum) = (((u64) b1) << 32) | b2; - } + if (avdatum->specified & AVTAB_ALLOWED) + avtab_allowed(avdatum) = le32_to_cpu(buf[items++]); + if (avdatum->specified & AVTAB_AUDITDENY) + avtab_auditdeny(avdatum) = le32_to_cpu(buf[items++]); + if (avdatum->specified & AVTAB_AUDITALLOW) + avtab_auditallow(avdatum) = le32_to_cpu(buf[items++]); } else { if (avdatum->specified & AVTAB_TRANSITION) avtab_transition(avdatum) = le32_to_cpu(buf[items++]); ==== //depot/projects/trustedbsd/sebsd/sys/sys/capability.h#6 (text+ko) ==== @@ -113,21 +113,11 @@ #define CAP_FOWNER (0x0000000000000010) #define CAP_FSETID (0x0000000000000020) #define CAP_KILL (0x0000000000000040) -#define CAP_LINK_DIR (0x0000000000000080) -#define CAP_SETFCAP (0x0000000000000100) -#define CAP_SETGID (0x0000000000000200) -#define CAP_SETUID (0x0000000000000400) -#define CAP_MAC_DOWNGRADE (0x0000000000000800) -#define CAP_MAC_READ (0x0000000000001000) -#define CAP_MAC_RELABEL_SUBJ (0x0000000000002000) -#define CAP_MAC_UPGRADE (0x0000000000004000) -#define CAP_MAC_WRITE (0x0000000000008000) -#define CAP_INF_NOFLOAT_OBJ (0x0000000000010000) -#define CAP_INF_NOFLOAT_SUBJ (0x0000000000020000) -#define CAP_INF_RELABEL_OBJ (0x0000000000040000) -#define CAP_INF_RELABEL_SUBJ (0x0000000000080000) -#define CAP_AUDIT_CONTROL (0x0000000000100000) -#define CAP_AUDIT_WRITE (0x0000000000200000) +#define CAP_SETFCAP (0x0000000000000080) +#define CAP_SETGID (0x0000000000000100) +#define CAP_SETUID (0x0000000000000200) +#define CAP_AUDIT_CONTROL (0x0000000000000400) +#define CAP_AUDIT_WRITE (0x0000000000000800) /* * The following is no longer functional. @@ -137,49 +127,44 @@ * We do not support modifying the capabilities of other processes, as Linux * (from which this one originated) does. */ -#define CAP_SETPCAP (0x0000000000400000) -/* This is unallocated: */ -#define CAP_XXX_INVALID1 (0x0000000000800000) -#define CAP_SYS_SETFFLAG (0x0000000001000000) +/*#define CAP_SETPCAP (0x0000000000002000)*/ +#define CAP_SYS_SETFFLAG (0x0000000000001000) /* * The CAP_LINUX_IMMUTABLE flag approximately maps into the * general file flag setting capability in BSD. Therefore, for * compatibility, map the constants. */ #define CAP_LINUX_IMMUTABLE CAP_SYS_SETFFLAG -#define CAP_NET_BIND_SERVICE (0x0000000002000000) -#define CAP_NET_BROADCAST (0x0000000004000000) -#define CAP_NET_ADMIN (0x0000000008000000) -#define CAP_NET_RAW (0x0000000010000000) -#define CAP_IPC_LOCK (0x0000000020000000) -#define CAP_IPC_OWNER (0x0000000040000000) +#define CAP_NET_BIND_SERVICE (0x0000000000002000) +#define CAP_NET_BROADCAST (0x0000000000004000) +#define CAP_NET_ADMIN (0x0000000000008000) +#define CAP_NET_RAW (0x0000000000010000) +#define CAP_IPC_LOCK (0x0000000000020000) +#define CAP_IPC_OWNER (0x0000000000040000) /* * The following capabilities, borrowed from Linux, are unsafe in a * secure environment. */ -#define CAP_SYS_MODULE (0x0000000080000000) -#define CAP_SYS_RAWIO (0x0000000100000000) -#define CAP_SYS_CHROOT (0x0000000200000000) -#define CAP_SYS_PTRACE (0x0000000400000000) -#define CAP_SYS_PACCT (0x0000000800000000) -#define CAP_SYS_ADMIN (0x0000001000000000) +#define CAP_SYS_MODULE (0x0000000000080000) +#define CAP_SYS_RAWIO (0x0000000000100000) +#define CAP_SYS_CHROOT (0x0000000000200000) +#define CAP_SYS_PTRACE (0x0000000000400000) +#define CAP_SYS_PACCT (0x0000000000800000) +#define CAP_SYS_ADMIN (0x0000000001000000) /* * Back to the safe ones, again. */ -#define CAP_SYS_BOOT (0x0000002000000000) -#define CAP_SYS_NICE (0x0000004000000000) -#define CAP_SYS_RESOURCE (0x0000008000000000) -#define CAP_SYS_TIME (0x0000010000000000) -#define CAP_SYS_TTY_CONFIG (0x0000020000000000) -#define CAP_MKNOD (0x0000040000000000) +#define CAP_SYS_BOOT (0x0000000002000000) +#define CAP_SYS_NICE (0x0000000004000000) +#define CAP_SYS_RESOURCE (0x0000000008000000) +#define CAP_SYS_TIME (0x0000000010000000) +#define CAP_SYS_TTY_CONFIG (0x0000000020000000) +#define CAP_MKNOD (0x0000000040000000) #define CAP_MAX_ID CAP_MKNOD #define CAP_ALL_ON (CAP_CHOWN | CAP_DAC_EXECUTE | CAP_DAC_WRITE | \ CAP_DAC_READ_SEARCH | CAP_FOWNER | CAP_FSETID | CAP_KILL | CAP_LINK_DIR | \ - CAP_SETFCAP | CAP_SETGID | CAP_SETUID | CAP_MAC_DOWNGRADE | \ - CAP_MAC_READ | CAP_MAC_RELABEL_SUBJ | CAP_MAC_UPGRADE | \ - CAP_MAC_WRITE | CAP_INF_NOFLOAT_OBJ | CAP_INF_NOFLOAT_SUBJ | \ - CAP_INF_RELABEL_OBJ | CAP_INF_RELABEL_SUBJ | CAP_AUDIT_CONTROL | \ + CAP_SETFCAP | CAP_SETGID | CAP_SETUID | CAP_AUDIT_CONTROL | \ CAP_AUDIT_WRITE | CAP_SYS_SETFFLAG | CAP_NET_BIND_SERVICE | \ CAP_NET_BROADCAST | CAP_NET_ADMIN | CAP_NET_RAW | CAP_IPC_LOCK | \ CAP_IPC_OWNER | CAP_SYS_MODULE | CAP_SYS_RAWIO | CAP_SYS_CHROOT | \ From owner-p4-projects@FreeBSD.ORG Wed Feb 9 20:14:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECDFC16A4D0; Wed, 9 Feb 2005 20:14:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A943F16A4CE for ; Wed, 9 Feb 2005 20:14:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95E4B43D41 for ; Wed, 9 Feb 2005 20:14:58 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j19KEwfs009619 for ; Wed, 9 Feb 2005 20:14:58 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j19KEwcp009616 for perforce@freebsd.org; Wed, 9 Feb 2005 20:14:58 GMT (envelope-from areisse@nailabs.com) Date: Wed, 9 Feb 2005 20:14:58 GMT Message-Id: <200502092014.j19KEwcp009616@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 70720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Feb 2005 20:14:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=70720 Change 70720 by areisse@areisse_tislabs on 2005/02/09 20:14:35 SEBSD policy: Change the ordering of capability permissions to match the in-kernel CAP_* values. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/access_vectors#8 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/access_vectors#8 (text+ko) ==== @@ -336,23 +336,11 @@ fowner fsetid kill - link_dir setfcap setgid setuid - mac_downgrade - mac_read - mac_relabel_subj - mac_upgrade - mac_write - inf_nofloat_obj - inf_nofloat_subj - inf_relabel_obj - inf_relabel_subj audit_control audit_write - setpcap - xxx_invalid1 linux_immutable net_bind_service net_broadcast @@ -372,7 +360,6 @@ sys_time sys_tty_config mknod - lease } From owner-p4-projects@FreeBSD.ORG Thu Feb 10 16:45:31 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08E0616A4D0; Thu, 10 Feb 2005 16:45:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C017A16A4CE for ; Thu, 10 Feb 2005 16:45:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A361B43D39 for ; Thu, 10 Feb 2005 16:45:30 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1AGjU0p096050 for ; Thu, 10 Feb 2005 16:45:30 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1AGjUnR096047 for perforce@freebsd.org; Thu, 10 Feb 2005 16:45:30 GMT (envelope-from areisse@nailabs.com) Date: Thu, 10 Feb 2005 16:45:30 GMT Message-Id: <200502101645.j1AGjUnR096047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 70771 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Feb 2005 16:45:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=70771 Change 70771 by areisse@areisse_tislabs on 2005/02/10 16:45:03 Cleanups from conversion to 32-bit access_vector_t. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/selinux.h#3 edit .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/security_compute_av.c#4 edit .. //depot/projects/trustedbsd/sebsd/sbin/sebsd_setfiles/setfiles.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/selinux.h#3 (text+ko) ==== @@ -5,7 +5,7 @@ #define _LINUX_FLASK_TYPES_H_ typedef unsigned short security_class_t; -typedef unsigned long long access_vector_t; +typedef unsigned int access_vector_t; typedef char *security_context_t; /* Return 1 if we are running on a SELinux kernel, or 0 if not or -1 if we get an error. */ ==== //depot/projects/trustedbsd/sebsd/lib/libsebsd/security_compute_av.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ #include "sebsd.h" typedef char __assert_class_size[sizeof(security_class_t) == 2 ? 1 : -1]; -typedef char __assert_av_size[sizeof(access_vector_t) == 8 ? 1 : -1]; +typedef char __assert_av_size[sizeof(access_vector_t) == 4 ? 1 : -1]; /* * Return the decisions SEBSD makes given a specific access vector. ==== //depot/projects/trustedbsd/sebsd/sbin/sebsd_setfiles/setfiles.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include #include -#include +#include static char errbuf[255 + 1]; /* Error message buffer */ static int verbose = 0; From owner-p4-projects@FreeBSD.ORG Sat Feb 12 01:14:12 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC62916A4D0; Sat, 12 Feb 2005 01:14:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5784816A4CE for ; Sat, 12 Feb 2005 01:14:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3EE043D41 for ; Sat, 12 Feb 2005 01:14:10 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1C1EAlI036910 for ; Sat, 12 Feb 2005 01:14:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1C1DwaF036885 for perforce@freebsd.org; Sat, 12 Feb 2005 01:13:58 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Feb 2005 01:13:58 GMT Message-Id: <200502120113.j1C1DwaF036885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 70849 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Feb 2005 01:14:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=70849 Change 70849 by sam@sam_ebb on 2005/02/12 01:13:44 IFC @ 70848 Affected files ... .. //depot/projects/wifi/UPDATING#11 integrate .. //depot/projects/wifi/bin/cp/utils.c#2 integrate .. //depot/projects/wifi/bin/csh/config.h#2 integrate .. //depot/projects/wifi/bin/ed/main.c#3 integrate .. //depot/projects/wifi/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/wifi/bin/ln/ln.c#3 integrate .. //depot/projects/wifi/bin/ls/util.c#3 integrate .. //depot/projects/wifi/bin/mkdir/mkdir.c#4 integrate .. //depot/projects/wifi/bin/pax/cpio.1#4 integrate .. //depot/projects/wifi/bin/pax/tar.1#4 integrate .. //depot/projects/wifi/bin/ps/keyword.c#2 integrate .. //depot/projects/wifi/bin/ps/ps.1#5 integrate .. //depot/projects/wifi/bin/ps/ps.c#4 integrate .. //depot/projects/wifi/bin/pwd/pwd.c#3 integrate .. //depot/projects/wifi/bin/rcp/rcp.c#3 integrate .. //depot/projects/wifi/bin/rm/rm.1#5 integrate .. //depot/projects/wifi/bin/setfacl/setfacl.1#4 integrate .. //depot/projects/wifi/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/wifi/bin/stty/stty.1#4 integrate .. //depot/projects/wifi/bin/stty/stty.c#2 integrate .. //depot/projects/wifi/contrib/netcat/FREEBSD-Xlist#1 branch .. //depot/projects/wifi/contrib/netcat/FREEBSD-upgrade#1 branch .. //depot/projects/wifi/contrib/netcat/atomicio.c#1 branch .. //depot/projects/wifi/contrib/netcat/nc.1#1 branch .. //depot/projects/wifi/contrib/netcat/netcat.c#1 branch .. //depot/projects/wifi/contrib/netcat/socks.c#1 branch .. //depot/projects/wifi/contrib/openpam/HISTORY#2 integrate .. //depot/projects/wifi/contrib/openpam/MANIFEST#2 integrate .. //depot/projects/wifi/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/wifi/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/wifi/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openpam/config.h.in#2 integrate .. //depot/projects/wifi/contrib/openpam/configure#2 integrate .. //depot/projects/wifi/contrib/openpam/configure.ac#1 branch .. //depot/projects/wifi/contrib/openpam/depcomp#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_free_envlist.3#1 branch .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/wifi/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/wifi/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/wifi/contrib/openpam/install-sh#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_free_envlist.c#1 branch .. //depot/projects/wifi/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/wifi/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/wifi/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/wifi/contrib/openpam/missing#2 integrate .. //depot/projects/wifi/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/pf/man/pf.4#2 integrate .. //depot/projects/wifi/contrib/pf/man/pf.conf.5#3 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#9 integrate .. //depot/projects/wifi/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/wifi/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/wifi/etc/rc.d/gbde#3 integrate .. //depot/projects/wifi/etc/rc.d/power_profile#2 integrate .. //depot/projects/wifi/games/fortune/datfiles/Makefile#2 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes2#6 delete .. //depot/projects/wifi/games/fortune/datfiles/fortunes2-o#2 integrate .. //depot/projects/wifi/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/wifi/games/fortune/datfiles/murphy#2 integrate .. //depot/projects/wifi/games/fortune/datfiles/zippy#2 integrate .. //depot/projects/wifi/games/fortune/fortune/fortune.6#2 integrate .. //depot/projects/wifi/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/wifi/games/fortune/strfile/strfile.8#3 integrate .. //depot/projects/wifi/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/wifi/games/fortune/tools/do_sort#2 integrate .. //depot/projects/wifi/games/fortune/tools/do_uniq.py#1 branch .. //depot/projects/wifi/games/number/number.c#2 integrate .. //depot/projects/wifi/games/random/random.c#2 integrate .. //depot/projects/wifi/include/Makefile#6 integrate .. //depot/projects/wifi/lib/Makefile#4 integrate .. //depot/projects/wifi/lib/libc/alpha/_fpmath.h#2 integrate .. //depot/projects/wifi/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/wifi/lib/libc/arm/_fpmath.h#2 integrate .. //depot/projects/wifi/lib/libc/gen/fpclassify.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/getusershell.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/isgreater.3#2 integrate .. //depot/projects/wifi/lib/libc/i386/_fpmath.h#2 integrate .. //depot/projects/wifi/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/wifi/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/wifi/lib/libc/net/getaddrinfo.3#3 integrate .. //depot/projects/wifi/lib/libc/net/getaddrinfo.c#4 integrate .. //depot/projects/wifi/lib/libc/net/getifaddrs.3#3 integrate .. //depot/projects/wifi/lib/libc/net/getnameinfo.3#3 integrate .. //depot/projects/wifi/lib/libc/net/inet6_rth_space.3#3 integrate .. //depot/projects/wifi/lib/libc/net/nsdispatch.3#2 integrate .. //depot/projects/wifi/lib/libc/nls/msgcat.c#2 integrate .. //depot/projects/wifi/lib/libc/nls/msgcat.h#2 integrate .. //depot/projects/wifi/lib/libc/powerpc/_fpmath.h#2 integrate .. //depot/projects/wifi/lib/libc/rpc/rpc_clnt_auth.3#2 integrate .. //depot/projects/wifi/lib/libc/rpc/rpc_clnt_calls.3#2 integrate .. //depot/projects/wifi/lib/libc/rpc/rpc_svc_calls.3#2 integrate .. //depot/projects/wifi/lib/libc/rpc/rpc_svc_err.3#2 integrate .. //depot/projects/wifi/lib/libc/rpc/rpc_svc_reg.3#2 integrate .. //depot/projects/wifi/lib/libc/rpc/rpc_xdr.3#2 integrate .. //depot/projects/wifi/lib/libc/rpc/rpcbind.3#2 integrate .. //depot/projects/wifi/lib/libc/sparc64/_fpmath.h#2 integrate .. //depot/projects/wifi/lib/libc/string/strnstr.c#2 integrate .. //depot/projects/wifi/lib/libc/sys/jail.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/read.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/write.2#3 integrate .. //depot/projects/wifi/lib/libcrypt/crypt.3#3 integrate .. //depot/projects/wifi/lib/libgpib/Makefile#1 branch .. //depot/projects/wifi/lib/libgpib/gpib.h#1 branch .. //depot/projects/wifi/lib/libgpib/ibfoo.c#1 branch .. //depot/projects/wifi/lib/libipsec/ipsec_set_policy.3#2 integrate .. //depot/projects/wifi/lib/libipsec/ipsec_strerror.3#2 integrate .. //depot/projects/wifi/lib/libmagic/Makefile#3 integrate .. //depot/projects/wifi/lib/libnetgraph/msg.c#2 integrate .. //depot/projects/wifi/lib/libpam/libpam/Makefile#4 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_exec/pam_exec.8#2 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_exec/pam_exec.c#2 integrate .. //depot/projects/wifi/lib/msun/Makefile#6 integrate .. //depot/projects/wifi/lib/msun/alpha/Makefile.inc#1 branch .. //depot/projects/wifi/lib/msun/amd64/Makefile.inc#1 branch .. //depot/projects/wifi/lib/msun/amd64/e_sqrt.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/Makefile.inc#1 branch .. //depot/projects/wifi/lib/msun/i387/e_acos.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_asin.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_atan2.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_atan2f.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_exp.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_fmod.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_log.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_log10.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_log10f.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_logf.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_remainder.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_remainderf.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_scalb.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_scalbf.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_sqrt.S#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_sqrtf.S#2 integrate .. //depot/projects/wifi/lib/msun/ia64/Makefile.inc#1 branch .. //depot/projects/wifi/lib/msun/man/atan2.3#3 integrate .. //depot/projects/wifi/lib/msun/man/atanh.3#3 integrate .. //depot/projects/wifi/lib/msun/src/e_acos.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_acosh.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_asin.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_atan2.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_atanh.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_cosh.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_exp.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_fmod.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_gamma.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_gamma_r.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_hypot.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_j0.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_j1.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_jn.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_lgamma.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_lgamma_r.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_log.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_log10.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_pow.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_rem_pio2.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_remainder.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_scalb.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_sinh.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_sqrt.c#2 integrate .. //depot/projects/wifi/lib/msun/src/k_cos.c#2 integrate .. //depot/projects/wifi/lib/msun/src/k_rem_pio2.c#2 integrate .. //depot/projects/wifi/lib/msun/src/k_sin.c#2 integrate .. //depot/projects/wifi/lib/msun/src/k_standard.c#2 delete .. //depot/projects/wifi/lib/msun/src/k_tan.c#2 integrate .. //depot/projects/wifi/lib/msun/src/math.h#5 integrate .. //depot/projects/wifi/lib/msun/src/math_private.h#2 integrate .. //depot/projects/wifi/lib/msun/src/s_lib_version.c#2 delete .. //depot/projects/wifi/lib/msun/src/s_matherr.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_acos.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_acosf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_acosh.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_acoshf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_asin.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_asinf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_atan2.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_atan2f.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_atanh.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_atanhf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_cosh.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_coshf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_exp.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_expf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_fmod.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_fmodf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_gamma.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_gamma_r.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_gammaf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_gammaf_r.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_hypot.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_hypotf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_j0.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_j0f.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_j1.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_j1f.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_jn.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_jnf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_lgamma.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_lgamma_r.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_lgammaf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_lgammaf_r.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_log.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_log10.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_log10f.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_logf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_pow.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_powf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_remainder.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_remainderf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_scalb.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_scalbf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_sinh.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_sinhf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_sqrt.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_sqrtf.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_y0.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_y0f.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_y1.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_y1f.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_yn.c#2 delete .. //depot/projects/wifi/lib/msun/src/w_ynf.c#2 delete .. //depot/projects/wifi/libexec/Makefile#4 integrate .. //depot/projects/wifi/libexec/getNAME/Makefile#2 delete .. //depot/projects/wifi/libexec/getNAME/getNAME.1#3 delete .. //depot/projects/wifi/libexec/getNAME/getNAME.c#2 delete .. //depot/projects/wifi/libexec/pppoed/Makefile#2 integrate .. //depot/projects/wifi/libexec/pppoed/pppoed.c#2 integrate .. //depot/projects/wifi/libexec/pt_chown/Makefile#4 integrate .. //depot/projects/wifi/libexec/revnetgroup/revnetgroup.8#2 integrate .. //depot/projects/wifi/libexec/revnetgroup/revnetgroup.c#2 integrate .. //depot/projects/wifi/libexec/rlogind/Makefile#2 integrate .. //depot/projects/wifi/libexec/rlogind/rlogind.8#3 integrate .. //depot/projects/wifi/libexec/rlogind/rlogind.c#2 integrate .. //depot/projects/wifi/libexec/rshd/Makefile#2 integrate .. //depot/projects/wifi/libexec/rshd/rshd.8#3 integrate .. //depot/projects/wifi/libexec/rshd/rshd.c#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/libmap.c#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/libmap.h#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.1#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/wifi/release/alpha/mkisoimages.sh#2 integrate .. //depot/projects/wifi/release/amd64/mkisoimages.sh#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#9 integrate .. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/wifi/release/i386/mkisoimages.sh#3 integrate .. //depot/projects/wifi/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/wifi/release/sparc64/mkisoimages.sh#2 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#9 integrate .. //depot/projects/wifi/sbin/atm/fore_dnld/fore_dnld.8#3 integrate .. //depot/projects/wifi/sbin/atm/ilmid/ilmid.8#3 integrate .. //depot/projects/wifi/sbin/ccdconfig/ccdconfig.8#5 integrate .. //depot/projects/wifi/sbin/ccdconfig/ccdconfig.c#2 integrate .. //depot/projects/wifi/sbin/conscontrol/conscontrol.8#2 integrate .. //depot/projects/wifi/sbin/devd/devd.cc#2 integrate .. //depot/projects/wifi/sbin/dump/main.c#3 integrate .. //depot/projects/wifi/sbin/dumpfs/dumpfs.8#2 integrate .. //depot/projects/wifi/sbin/ffsinfo/ffsinfo.c#3 integrate .. //depot/projects/wifi/sbin/fsck/fsck.8#2 integrate .. //depot/projects/wifi/sbin/fsck/fsck.c#2 integrate .. //depot/projects/wifi/sbin/fsck_ffs/fsck_ffs.8#3 integrate .. //depot/projects/wifi/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/wifi/sbin/fsck_msdosfs/fsck_msdosfs.8#3 integrate .. //depot/projects/wifi/sbin/fsck_msdosfs/main.c#2 integrate .. //depot/projects/wifi/sbin/gbde/gbde.c#2 integrate .. //depot/projects/wifi/sbin/idmapd/Makefile#2 integrate .. //depot/projects/wifi/sbin/ipfs/Makefile#2 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/wifi/sbin/ipmon/Makefile#2 integrate .. //depot/projects/wifi/sbin/kldconfig/kldconfig.8#3 integrate .. //depot/projects/wifi/sbin/kldconfig/kldconfig.c#2 integrate .. //depot/projects/wifi/sbin/kldunload/kldunload.8#4 integrate .. //depot/projects/wifi/sbin/kldunload/kldunload.c#2 integrate .. //depot/projects/wifi/sbin/ldconfig/ldconfig.c#3 integrate .. //depot/projects/wifi/sbin/mdconfig/mdconfig.c#6 integrate .. //depot/projects/wifi/sbin/mdmfs/mdmfs.c#3 integrate .. //depot/projects/wifi/sbin/mknod/mknod.8#3 integrate .. //depot/projects/wifi/sbin/mount/mount.c#3 integrate .. //depot/projects/wifi/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate .. //depot/projects/wifi/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/wifi/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/wifi/sbin/mount_nfs4/mount_nfs4.8#2 integrate .. //depot/projects/wifi/sbin/mount_nfs4/mount_nfs4.c#2 integrate .. //depot/projects/wifi/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/wifi/sbin/mount_ntfs/mount_ntfs.c#2 integrate .. //depot/projects/wifi/sbin/mount_nullfs/mount_nullfs.c#2 integrate .. //depot/projects/wifi/sbin/mount_udf/mount_udf.8#2 integrate .. //depot/projects/wifi/sbin/mount_umapfs/mount_umapfs.c#2 integrate .. //depot/projects/wifi/sbin/mount_unionfs/mount_unionfs.c#2 integrate .. //depot/projects/wifi/sbin/nos-tun/nos-tun.8#3 integrate .. //depot/projects/wifi/sbin/nos-tun/nos-tun.c#2 integrate .. //depot/projects/wifi/sbin/ping6/ping6.8#3 integrate .. //depot/projects/wifi/sbin/ping6/ping6.c#3 integrate .. //depot/projects/wifi/sbin/quotacheck/quotacheck.8#2 integrate .. //depot/projects/wifi/sbin/quotacheck/quotacheck.c#2 integrate .. //depot/projects/wifi/sbin/reboot/reboot.8#2 integrate .. //depot/projects/wifi/sbin/reboot/reboot.c#3 integrate .. //depot/projects/wifi/sbin/restore/main.c#2 integrate .. //depot/projects/wifi/sbin/savecore/savecore.c#3 integrate .. //depot/projects/wifi/sbin/slattach/slattach.8#5 integrate .. //depot/projects/wifi/sbin/slattach/slattach.c#2 integrate .. //depot/projects/wifi/sbin/startslip/startslip.c#2 integrate .. //depot/projects/wifi/sbin/swapon/swapon.8#3 integrate .. //depot/projects/wifi/sbin/swapon/swapon.c#3 integrate .. //depot/projects/wifi/sbin/sysctl/sysctl.c#3 integrate .. //depot/projects/wifi/sbin/umount/umount.c#2 integrate .. //depot/projects/wifi/secure/usr.bin/bdes/bdes.c#3 integrate .. //depot/projects/wifi/share/examples/etc/make.conf#9 integrate .. //depot/projects/wifi/share/examples/ses/getencstat/getencstat.0#2 integrate .. //depot/projects/wifi/share/examples/ses/sesd/sesd.0#2 integrate .. //depot/projects/wifi/share/examples/ses/setencstat/setencstat.0#2 integrate .. //depot/projects/wifi/share/examples/ses/setobjstat/setobjstat.0#2 integrate .. //depot/projects/wifi/share/man/man1/builtin.1#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_mutex_lock.3#2 integrate .. //depot/projects/wifi/share/man/man4/Makefile#13 integrate .. //depot/projects/wifi/share/man/man4/acpi.4#5 integrate .. //depot/projects/wifi/share/man/man4/altq.4#8 integrate .. //depot/projects/wifi/share/man/man4/amr.4#5 integrate .. //depot/projects/wifi/share/man/man4/ata.4#3 integrate .. //depot/projects/wifi/share/man/man4/atapicam.4#2 integrate .. //depot/projects/wifi/share/man/man4/cpufreq.4#1 branch .. //depot/projects/wifi/share/man/man4/ed.4#3 integrate .. //depot/projects/wifi/share/man/man4/em.4#5 integrate .. //depot/projects/wifi/share/man/man4/faith.4#2 integrate .. //depot/projects/wifi/share/man/man4/fxp.4#3 integrate .. //depot/projects/wifi/share/man/man4/gdb.4#5 integrate .. //depot/projects/wifi/share/man/man4/icmp6.4#3 integrate .. //depot/projects/wifi/share/man/man4/inet6.4#2 integrate .. //depot/projects/wifi/share/man/man4/ip6.4#3 integrate .. //depot/projects/wifi/share/man/man4/ipsec.4#3 integrate .. //depot/projects/wifi/share/man/man4/isp.4#3 integrate .. //depot/projects/wifi/share/man/man4/ispfw.4#2 integrate .. //depot/projects/wifi/share/man/man4/kame.4#2 integrate .. //depot/projects/wifi/share/man/man4/led.4#3 integrate .. //depot/projects/wifi/share/man/man4/mac_biba.4#3 integrate .. //depot/projects/wifi/share/man/man4/mac_ifoff.4#2 integrate .. //depot/projects/wifi/share/man/man4/mac_partition.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/Makefile#3 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/el.4#3 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ep.4#3 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/oltr.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.i386/pbio.4#3 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ray.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_async.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_atm.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_atmpif.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_bpf.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_cisco.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_eiface.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_etf.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_hole.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_iface.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_ipfw.4#1 branch .. //depot/projects/wifi/share/man/man4/ng_ksocket.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_l2tp.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_lmi.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_netflow.4#5 integrate .. //depot/projects/wifi/share/man/man4/ng_ppp.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_pptpgre.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_socket.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_source.4#4 integrate .. //depot/projects/wifi/share/man/man4/ng_sppp.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_tee.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_tty.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_uni.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_vjc.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_vlan.4#2 integrate .. //depot/projects/wifi/share/man/man4/oldcard.4#2 integrate .. //depot/projects/wifi/share/man/man4/pci.4#2 integrate .. //depot/projects/wifi/share/man/man4/pcic.4#2 integrate .. //depot/projects/wifi/share/man/man4/sn.4#2 integrate .. //depot/projects/wifi/share/man/man4/stf.4#2 integrate .. //depot/projects/wifi/share/man/man4/txp.4#3 integrate .. //depot/projects/wifi/share/man/man4/udbp.4#2 integrate .. //depot/projects/wifi/share/man/man4/ufm.4#2 integrate .. //depot/projects/wifi/share/man/man4/uhci.4#2 integrate .. //depot/projects/wifi/share/man/man4/umass.4#4 integrate .. //depot/projects/wifi/share/man/man4/ums.4#2 integrate .. //depot/projects/wifi/share/man/man4/urio.4#2 integrate .. //depot/projects/wifi/share/man/man4/vlan.4#5 integrate .. //depot/projects/wifi/share/man/man5/config.5#2 integrate .. //depot/projects/wifi/share/man/man5/elf.5#2 integrate .. //depot/projects/wifi/share/man/man5/hesiod.conf.5#2 integrate .. //depot/projects/wifi/share/man/man5/mailer.conf.5#3 integrate .. //depot/projects/wifi/share/man/man5/make.conf.5#8 integrate .. //depot/projects/wifi/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/wifi/share/man/man5/passwd.5#3 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/wifi/share/man/man7/ports.7#5 integrate .. //depot/projects/wifi/share/man/man9/MUTEX_PROFILING.9#3 integrate .. //depot/projects/wifi/share/man/man9/Makefile#7 integrate .. //depot/projects/wifi/share/man/man9/VOP_ACCESS.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_ACLCHECK.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_ADVLOCK.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_ATTRIB.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_BWRITE.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_CREATE.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_FSYNC.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_GETACL.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_GETEXTATTR.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_GETVOBJECT.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_INACTIVE.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_IOCTL.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_LINK.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_LISTEXTATTR.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_LOOKUP.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_OPENCLOSE.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_PATHCONF.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_PRINT.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_RDWR.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_READDIR.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_READLINK.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_REALLOCBLKS.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_REMOVE.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_RENAME.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_SETACL.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_SETEXTATTR.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_STRATEGY.9#2 integrate .. //depot/projects/wifi/share/man/man9/acl.9#2 integrate .. //depot/projects/wifi/share/man/man9/alq.9#2 integrate .. //depot/projects/wifi/share/man/man9/device_find_child.9#2 integrate .. //depot/projects/wifi/share/man/man9/g_data.9#2 integrate .. //depot/projects/wifi/share/man/man9/mac.9#3 integrate .. //depot/projects/wifi/share/man/man9/mbchain.9#2 integrate .. //depot/projects/wifi/share/man/man9/mdchain.9#2 integrate .. //depot/projects/wifi/share/man/man9/mi_switch.9#2 integrate .. //depot/projects/wifi/share/man/man9/microtime.9#3 integrate .. //depot/projects/wifi/share/man/man9/mutex.9#3 integrate .. //depot/projects/wifi/share/man/man9/style.9#6 integrate .. //depot/projects/wifi/share/man/man9/timeout.9#4 integrate .. //depot/projects/wifi/share/man/man9/tvtohz.9#2 integrate .. //depot/projects/wifi/share/man/man9/vfs_unmountall.9#2 integrate .. //depot/projects/wifi/share/man/man9/vget.9#2 integrate .. //depot/projects/wifi/share/mk/bsd.lib.mk#3 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_kn20aa.c#3 integrate .. //depot/projects/wifi/sys/alpha/alpha/machdep.c#7 integrate .. //depot/projects/wifi/sys/alpha/include/bus.h#4 integrate .. //depot/projects/wifi/sys/alpha/include/cpuconf.h#3 integrate .. //depot/projects/wifi/sys/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/wifi/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/wifi/sys/alpha/osf1/imgact_osf1.c#3 integrate .. //depot/projects/wifi/sys/alpha/osf1/osf1_sysvec.c#2 integrate .. //depot/projects/wifi/sys/alpha/pci/lca.c#2 integrate .. //depot/projects/wifi/sys/alpha/pci/lcareg.h#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/wifi/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/wifi/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/wifi/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/wifi/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/wifi/sys/arm/include/cpu.h#3 integrate .. //depot/projects/wifi/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/wifi/sys/boot/i386/boot0/boot0.S#5 integrate .. //depot/projects/wifi/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/wifi/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.c#7 integrate .. //depot/projects/wifi/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/wifi/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/wifi/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/wifi/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/wifi/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/wifi/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/wifi/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/wifi/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/wifi/sys/compat/ndis/ntoskrnl_var.h#6 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_hal.c#5 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/wifi/sys/compat/pecoff/imgact_pecoff.c#6 integrate .. //depot/projects/wifi/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ipc.c#3 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_util.h#3 integrate .. //depot/projects/wifi/sys/conf/Makefile.alpha#2 integrate .. //depot/projects/wifi/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/wifi/sys/conf/Makefile.arm#4 integrate .. //depot/projects/wifi/sys/conf/Makefile.i386#2 integrate .. //depot/projects/wifi/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/wifi/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/wifi/sys/conf/Makefile.powerpc#3 integrate .. //depot/projects/wifi/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/wifi/sys/conf/NOTES#12 integrate .. //depot/projects/wifi/sys/conf/files#16 integrate .. //depot/projects/wifi/sys/conf/files.alpha#3 integrate .. //depot/projects/wifi/sys/conf/files.i386#9 integrate .. //depot/projects/wifi/sys/conf/files.pc98#6 integrate .. //depot/projects/wifi/sys/conf/kmod.mk#9 integrate .. //depot/projects/wifi/sys/conf/options#9 integrate .. //depot/projects/wifi/sys/conf/options.pc98#3 integrate .. //depot/projects/wifi/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/oltr/if_oltr_isa.c#1 branch .. //depot/projects/wifi/sys/contrib/dev/oltr/if_oltr_pci.c#1 branch .. //depot/projects/wifi/sys/contrib/dev/oltr/if_oltrvar.h#1 branch .. //depot/projects/wifi/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/wifi/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pcib.c#6 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_perf.c#1 branch .. //depot/projects/wifi/sys/dev/acpica/acpi_throttle.c#1 branch .. //depot/projects/wifi/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/wifi/sys/dev/amr/amr_cam.c#5 integrate .. //depot/projects/wifi/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/wifi/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_card.c#5 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus_cis.h#4 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbusvar.h#4 integrate .. //depot/projects/wifi/sys/dev/cpufreq/ichss.c#1 branch .. //depot/projects/wifi/sys/dev/cs/if_cs.c#4 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs_pccard.c#5 integrate .. //depot/projects/wifi/sys/dev/cs/if_csvar.h#4 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_3c503.c#1 branch .. //depot/projects/wifi/sys/dev/ed/if_ed_cbus.c#4 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_hpp.c#1 branch .. //depot/projects/wifi/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_novell.c#1 branch .. //depot/projects/wifi/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_sic.c#1 branch .. //depot/projects/wifi/sys/dev/ed/if_ed_wd80x3.c#1 branch .. //depot/projects/wifi/sys/dev/ed/if_edreg.h#3 integrate .. //depot/projects/wifi/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#7 integrate .. //depot/projects/wifi/sys/dev/fe/mb86960.h#1 branch .. //depot/projects/wifi/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/wifi/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/wifi/sys/dev/ic/i8237.h#2 integrate .. //depot/projects/wifi/sys/dev/ieee488/ibfoo_int.h#1 branch .. //depot/projects/wifi/sys/dev/ieee488/pcii.c#1 branch .. //depot/projects/wifi/sys/dev/ieee488/ugpib.h#1 branch .. //depot/projects/wifi/sys/dev/ieee488/upd7210.c#1 branch .. //depot/projects/wifi/sys/dev/ieee488/upd7210.h#1 branch .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/wifi/sys/dev/iir/iir.h#3 integrate .. //depot/projects/wifi/sys/dev/ips/ips.c#2 integrate .. //depot/projects/wifi/sys/dev/ips/ips.h#2 integrate .. //depot/projects/wifi/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/wifi/sys/dev/ips/ips_disk.c#2 integrate .. //depot/projects/wifi/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/wifi/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/ispfw/asm_2300.h#3 integrate .. //depot/projects/wifi/sys/dev/led/led.c#2 integrate .. //depot/projects/wifi/sys/dev/mcd/mcd.c#4 integrate .. //depot/projects/wifi/sys/dev/md/md.c#8 integrate .. //depot/projects/wifi/sys/dev/ncv/ncr53c500_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/nsp/nsp_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/owi/if_owi_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/pbio/pbio.c#4 integrate .. //depot/projects/wifi/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/wifi/sys/dev/pci/pci.c#9 integrate .. //depot/projects/wifi/sys/dev/puc/puc_sbus.c#4 integrate .. //depot/projects/wifi/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/wifi/sys/dev/random/probe.c#2 integrate .. //depot/projects/wifi/sys/dev/ray/if_ray.c#6 integrate .. //depot/projects/wifi/sys/dev/ray/if_rayvar.h#5 integrate .. //depot/projects/wifi/sys/dev/scd/scd.c#3 integrate .. //depot/projects/wifi/sys/dev/sio/sio.c#2 integrate .. //depot/projects/wifi/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/wifi/sys/dev/streams/streams.c#4 integrate .. //depot/projects/wifi/sys/dev/twa/twa_cam.c#3 integrate .. //depot/projects/wifi/sys/dev/twa/twa_globals.c#3 integrate .. //depot/projects/wifi/sys/dev/twa/twa_ioctl.h#2 integrate .. //depot/projects/wifi/sys/dev/twe/twe.c#3 integrate .. //depot/projects/wifi/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/wifi/sys/dev/uart/uart_dev_sab82532.c#4 integrate .. //depot/projects/wifi/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/wifi/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/hid.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/umodem.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/wifi/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/wifi/sys/dev/vx/if_vx.c#3 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#15 integrate .. //depot/projects/wifi/sys/fs/fdescfs/fdesc.h#3 integrate .. //depot/projects/wifi/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_hash.c#3 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_vnops.c#7 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_denode.c#5 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#11 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.h#2 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vnops.c#9 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#8 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_node.c#5 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_node.c#6 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_subr.h#3 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_vfsops.c#7 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_vnops.c#7 integrate .. //depot/projects/wifi/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/wifi/sys/fs/udf/udf_vnops.c#9 integrate .. //depot/projects/wifi/sys/fs/umapfs/umap_vnops.c#5 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#9 integrate .. //depot/projects/wifi/sys/geom/gate/g_gate.c#3 integrate .. //depot/projects/wifi/sys/geom/gate/g_gate.h#2 integrate .. //depot/projects/wifi/sys/geom/geom_disk.c#4 integrate .. //depot/projects/wifi/sys/geom/geom_kern.c#3 integrate .. //depot/projects/wifi/sys/geom/geom_vfs.c#6 integrate .. //depot/projects/wifi/sys/geom/geom_vfs.h#3 integrate .. //depot/projects/wifi/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/wifi/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_inode.c#4 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_lookup.c#3 integrate .. //depot/projects/wifi/sys/i386/conf/NOTES#7 integrate .. //depot/projects/wifi/sys/i386/conf/PAE#3 integrate .. //depot/projects/wifi/sys/i386/i386/apic_vector.s#3 integrate .. //depot/projects/wifi/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/wifi/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/wifi/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/wifi/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/wifi/sys/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/mptable.c#5 integrate .. //depot/projects/wifi/sys/i386/i386/p4tcc.c#3 integrate .. //depot/projects/wifi/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/wifi/sys/i386/ibcs2/ibcs2_fcntl.c#3 integrate .. //depot/projects/wifi/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/wifi/sys/i386/ibcs2/ibcs2_msg.c#3 integrate .. //depot/projects/wifi/sys/i386/ibcs2/ibcs2_other.c#3 integrate .. //depot/projects/wifi/sys/i386/ibcs2/ibcs2_stat.c#3 integrate .. //depot/projects/wifi/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/wifi/sys/i386/ibcs2/ibcs2_util.c#3 integrate .. //depot/projects/wifi/sys/i386/ibcs2/ibcs2_util.h#3 integrate .. //depot/projects/wifi/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/wifi/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/wifi/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/wifi/sys/i386/include/smp.h#4 integrate .. //depot/projects/wifi/sys/i386/isa/clock.c#2 integrate .. //depot/projects/wifi/sys/i386/isa/isa_dma.c#2 integrate .. //depot/projects/wifi/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/wifi/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/wifi/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/wifi/sys/i386/pci/pci_pir.c#3 integrate .. //depot/projects/wifi/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/wifi/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/wifi/sys/ia64/ia64/mca.c#3 integrate .. //depot/projects/wifi/sys/ia64/include/asm.h#3 integrate .. //depot/projects/wifi/sys/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/wifi/sys/isa/isavar.h#3 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_vfsops.c#7 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_vnops.c#5 integrate .. //depot/projects/wifi/sys/kern/cpufreq_if.m#1 branch .. //depot/projects/wifi/sys/kern/imgact_aout.c#5 integrate .. //depot/projects/wifi/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/wifi/sys/kern/imgact_gzip.c#3 integrate .. //depot/projects/wifi/sys/kern/imgact_shell.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_conf.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_cpu.c#1 branch .. //depot/projects/wifi/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/wifi/sys/kern/kern_environment.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_event.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_exec.c#8 integrate .. //depot/projects/wifi/sys/kern/kern_exit.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_idle.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_jail.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_kse.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_mib.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_mtxpool.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_proc.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_prot.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_time.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/wifi/sys/kern/md5c.c#3 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#8 integrate .. //depot/projects/wifi/sys/kern/subr_bus.c#7 integrate .. //depot/projects/wifi/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/wifi/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/wifi/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/wifi/sys/kern/sys_generic.c#7 integrate .. //depot/projects/wifi/sys/kern/sysv_msg.c#7 integrate .. //depot/projects/wifi/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/wifi/sys/kern/uipc_mbuf2.c#3 integrate .. //depot/projects/wifi/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/wifi/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/wifi/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/wifi/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_cluster.c#8 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#13 integrate .. //depot/projects/wifi/sys/kern/vfs_export.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_init.c#6 integrate .. //depot/projects/wifi/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#15 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/wifi/sys/kern/vnode_if.src#6 integrate .. //depot/projects/wifi/sys/libkern/gets.c#1 branch .. //depot/projects/wifi/sys/libkern/strlcat.c#3 integrate .. //depot/projects/wifi/sys/libkern/strlcpy.c#3 integrate .. //depot/projects/wifi/sys/libkern/strspn.c#1 branch .. //depot/projects/wifi/sys/libkern/strvalid.c#2 integrate .. //depot/projects/wifi/sys/modules/Makefile#13 integrate .. //depot/projects/wifi/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/acpi/acpi_perf/Makefile#1 branch .. //depot/projects/wifi/sys/modules/arl/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/cpufreq/Makefile#1 branch .. //depot/projects/wifi/sys/modules/ed/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ndis/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/netgraph/Makefile#5 integrate .. //depot/projects/wifi/sys/modules/netgraph/ipfw/Makefile#1 branch .. //depot/projects/wifi/sys/modules/oltr/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/sysvipc/sysvmsg/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/sysvipc/sysvsem/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/sysvipc/sysvshm/Makefile#2 integrate .. //depot/projects/wifi/sys/net/if.c#8 integrate .. //depot/projects/wifi/sys/net/if_clone.c#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#50 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#39 integrate .. //depot/projects/wifi/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/wifi/sys/netgraph/netflow/netflow.c#5 integrate .. //depot/projects/wifi/sys/netgraph/ng_bridge.c#4 integrate .. //depot/projects/wifi/sys/netgraph/ng_device.c#6 integrate .. //depot/projects/wifi/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_eiface.h#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_etf.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/wifi/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/wifi/sys/netgraph/ng_iface.h#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_ipfw.c#1 branch .. //depot/projects/wifi/sys/netgraph/ng_ipfw.h#1 branch .. //depot/projects/wifi/sys/netgraph/ng_message.h#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_ppp.h#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_sample.c#4 integrate .. //depot/projects/wifi/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/wifi/sys/netgraph/ng_split.c#2 integrate .. //depot/projects/wifi/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_sppp.h#3 integrate .. //depot/projects/wifi/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/wifi/sys/netinet/ip_fw_pfil.c#7 integrate .. //depot/projects/wifi/sys/netinet/ip_input.c#3 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/wifi/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/wifi/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/wifi/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/wifi/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_nfsiod.c#5 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_node.c#7 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#14 integrate .. //depot/projects/wifi/sys/pc98/i386/machdep.c#6 integrate .. //depot/projects/wifi/sys/pc98/pc98/clock.c#2 integrate .. //depot/projects/wifi/sys/pc98/pc98/isa_dma.c#2 integrate .. //depot/projects/wifi/sys/pc98/pc98/sio.c#2 integrate .. //depot/projects/wifi/sys/pci/if_rl.c#3 integrate .. //depot/projects/wifi/sys/pci/if_sk.c#8 integrate .. //depot/projects/wifi/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/wifi/sys/powerpc/include/bus.h#4 integrate .. //depot/projects/wifi/sys/powerpc/include/hid.h#2 integrate .. //depot/projects/wifi/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/clock.c#3 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/wifi/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/wifi/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/wifi/sys/sparc64/include/bus.h#3 integrate .. //depot/projects/wifi/sys/sparc64/isa/isa_dma.c#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/wifi/sys/sys/buf.h#8 integrate .. //depot/projects/wifi/sys/sys/callout.h#2 integrate .. //depot/projects/wifi/sys/sys/cdio.h#2 integrate .. //depot/projects/wifi/sys/sys/conf.h#5 integrate .. //depot/projects/wifi/sys/sys/cpu.h#1 branch .. //depot/projects/wifi/sys/sys/file.h#5 integrate .. //depot/projects/wifi/sys/sys/filedesc.h#8 integrate .. //depot/projects/wifi/sys/sys/imgact.h#2 integrate .. //depot/projects/wifi/sys/sys/jail.h#4 integrate .. //depot/projects/wifi/sys/sys/kernel.h#6 integrate .. //depot/projects/wifi/sys/sys/libkern.h#2 integrate .. //depot/projects/wifi/sys/sys/mbuf.h#6 integrate .. //depot/projects/wifi/sys/sys/md5.h#3 integrate .. //depot/projects/wifi/sys/sys/mount.h#8 integrate .. //depot/projects/wifi/sys/sys/param.h#5 integrate .. //depot/projects/wifi/sys/sys/socketvar.h#3 integrate .. //depot/projects/wifi/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/wifi/sys/sys/sysctl.h#3 integrate .. //depot/projects/wifi/sys/sys/systm.h#7 integrate .. //depot/projects/wifi/sys/sys/vnode.h#16 integrate .. //depot/projects/wifi/sys/tools/vnode_if.awk#6 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_balloc.c#4 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_extern.h#6 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_inode.c#6 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_rawread.c#6 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_softdep_stub.c#3 delete .. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#15 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/wifi/sys/ufs/ufs/extattr.h#3 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_dirhash.c#3 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_inode.c#3 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vfsops.c#5 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#12 integrate .. //depot/projects/wifi/sys/vm/memguard.c#2 integrate .. //depot/projects/wifi/sys/vm/vm_meter.c#4 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#8 integrate .. //depot/projects/wifi/sys/vm/vm_pager.c#6 integrate .. //depot/projects/wifi/sys/vm/vm_zeroidle.c#4 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#12 integrate .. //depot/projects/wifi/tools/regression/ia64/unaligned/test.c#3 integrate .. //depot/projects/wifi/tools/regression/ia64/unaligned/unaligned.t#3 integrate .. //depot/projects/wifi/tools/regression/lib/libc/string/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/lib/libc/string/test-strerror.c#3 integrate .. //depot/projects/wifi/tools/tools/kernxref/kernxref.sh#2 integrate .. //depot/projects/wifi/tools/tools/nanobsd/i386.diskimage#3 integrate .. //depot/projects/wifi/tools/tools/recoverdisk/README#2 integrate .. //depot/projects/wifi/tools/tools/tinderbox/etc/releng_4.rc#2 integrate .. //depot/projects/wifi/tools/tools/tinderbox/etc/update_releng_4.rc#2 integrate .. //depot/projects/wifi/tools/tools/tinderbox/www/index.cgi#2 integrate .. //depot/projects/wifi/usr.bin/bluetooth/bthost/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/bluetooth/btsockstat/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/bluetooth/rfcomm_sppd/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/bzip2/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/c89/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/finger/finger.conf.5#3 integrate .. //depot/projects/wifi/usr.bin/fstat/fstat.1#3 integrate .. //depot/projects/wifi/usr.bin/fstat/fstat.c#4 integrate .. //depot/projects/wifi/usr.bin/gencat/gencat.c#2 integrate .. //depot/projects/wifi/usr.bin/hesinfo/hesinfo.1#2 integrate .. //depot/projects/wifi/usr.bin/indent/indent.1#2 integrate .. //depot/projects/wifi/usr.bin/ipcs/ipcs.c#3 integrate .. //depot/projects/wifi/usr.bin/kdump/kdump.1#2 integrate .. //depot/projects/wifi/usr.bin/locate/bigram/locate.bigram.c#2 integrate .. //depot/projects/wifi/usr.bin/m4/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/make/GNode.h#1 branch .. //depot/projects/wifi/usr.bin/make/Makefile#7 integrate .. //depot/projects/wifi/usr.bin/make/Makefile.dist#2 integrate .. //depot/projects/wifi/usr.bin/make/arch.c#7 integrate .. //depot/projects/wifi/usr.bin/make/arch.h#1 branch .. //depot/projects/wifi/usr.bin/make/buf.c#4 integrate .. //depot/projects/wifi/usr.bin/make/buf.h#4 integrate .. //depot/projects/wifi/usr.bin/make/compat.c#7 integrate .. //depot/projects/wifi/usr.bin/make/compat.h#1 branch .. //depot/projects/wifi/usr.bin/make/cond.c#6 integrate .. //depot/projects/wifi/usr.bin/make/cond.h#1 branch .. //depot/projects/wifi/usr.bin/make/config.h#5 integrate .. //depot/projects/wifi/usr.bin/make/dir.c#7 integrate .. //depot/projects/wifi/usr.bin/make/dir.h#5 integrate .. //depot/projects/wifi/usr.bin/make/for.c#6 integrate .. //depot/projects/wifi/usr.bin/make/for.h#1 branch .. //depot/projects/wifi/usr.bin/make/globals.h#1 branch .. //depot/projects/wifi/usr.bin/make/hash.c#5 integrate .. //depot/projects/wifi/usr.bin/make/hash.h#5 integrate .. //depot/projects/wifi/usr.bin/make/job.c#12 integrate .. //depot/projects/wifi/usr.bin/make/job.h#6 integrate .. //depot/projects/wifi/usr.bin/make/lst.c#1 branch .. //depot/projects/wifi/usr.bin/make/lst.h#6 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstAppend.c#6 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstConcat.c#7 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDeQueue.c#6 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDestroy.c#8 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDupl.c#7 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstFindFrom.c#6 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstForEachFrom.c#5 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstInsert.c#6 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstMember.c#5 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstRemove.c#6 delete .. //depot/projects/wifi/usr.bin/make/main.c#12 integrate .. //depot/projects/wifi/usr.bin/make/make.c#8 integrate .. //depot/projects/wifi/usr.bin/make/make.h#5 integrate .. //depot/projects/wifi/usr.bin/make/nonints.h#7 integrate .. //depot/projects/wifi/usr.bin/make/parse.c#9 integrate .. //depot/projects/wifi/usr.bin/make/parse.h#1 branch .. //depot/projects/wifi/usr.bin/make/pathnames.h#2 integrate .. //depot/projects/wifi/usr.bin/make/sprite.h#2 integrate .. //depot/projects/wifi/usr.bin/make/str.c#7 integrate .. //depot/projects/wifi/usr.bin/make/str.h#1 branch .. //depot/projects/wifi/usr.bin/make/suff.c#7 integrate .. //depot/projects/wifi/usr.bin/make/suff.h#1 branch .. //depot/projects/wifi/usr.bin/make/targ.c#8 integrate .. //depot/projects/wifi/usr.bin/make/targ.h#1 branch .. //depot/projects/wifi/usr.bin/make/util.c#3 integrate .. //depot/projects/wifi/usr.bin/make/util.h#1 branch .. //depot/projects/wifi/usr.bin/make/var.c#8 integrate .. //depot/projects/wifi/usr.bin/make/var.h#4 integrate .. //depot/projects/wifi/usr.bin/make/var_modify.c#5 integrate .. //depot/projects/wifi/usr.bin/nc/Makefile#1 branch .. //depot/projects/wifi/usr.bin/newkey/extern.h#2 integrate .. //depot/projects/wifi/usr.bin/newkey/newkey.c#2 integrate .. //depot/projects/wifi/usr.bin/newkey/update.c#2 integrate .. //depot/projects/wifi/usr.bin/rpcgen/rpc_main.c#2 integrate .. //depot/projects/wifi/usr.bin/rpcgen/rpc_tblout.c#2 integrate .. //depot/projects/wifi/usr.bin/sed/main.c#2 integrate .. //depot/projects/wifi/usr.bin/sockstat/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/stat/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/tail/forward.c#5 integrate .. //depot/projects/wifi/usr.bin/talk/ctl.c#2 integrate .. //depot/projects/wifi/usr.bin/talk/look_up.c#2 integrate .. //depot/projects/wifi/usr.bin/usbhidaction/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/vgrind/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/whereis/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/whereis/whereis.c#2 integrate .. //depot/projects/wifi/usr.bin/which/which.1#3 integrate .. //depot/projects/wifi/usr.bin/which/which.c#2 integrate .. //depot/projects/wifi/usr.sbin/Makefile#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<<