From owner-p4-projects@FreeBSD.ORG Sun Apr 6 00:28:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63FE91065678; Sun, 6 Apr 2008 00:28:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1209C106564A for ; Sun, 6 Apr 2008 00:28:55 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA5138FC0A for ; Sun, 6 Apr 2008 00:28:54 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m360Sst3078412 for ; Sun, 6 Apr 2008 00:28:54 GMT (envelope-from alm@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m360Ssfq078410 for perforce@freebsd.org; Sun, 6 Apr 2008 00:28:54 GMT (envelope-from alm@freebsd.org) Date: Sun, 6 Apr 2008 00:28:54 GMT Message-Id: <200804060028.m360Ssfq078410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alm@freebsd.org using -f From: Aaron Meihm To: Perforce Change Reviews Cc: Subject: PERFORCE change 139439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2008 00:28:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=139439 Change 139439 by alm@alm_praetorian on 2008/04/06 00:27:56 Additional code working towards new threaded producer/consumer model. Affected files ... .. //depot/projects/trustedbsd/netauditd/grammar.y#3 edit .. //depot/projects/trustedbsd/netauditd/netauditd.h#13 edit .. //depot/projects/trustedbsd/netauditd/reader.c#2 edit .. //depot/projects/trustedbsd/netauditd/reader.h#2 edit .. //depot/projects/trustedbsd/netauditd/writer.c#2 edit .. //depot/projects/trustedbsd/netauditd/writer.h#2 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/grammar.y#3 (text+ko) ==== @@ -131,6 +131,7 @@ new->ac_name = $2; new->ac_path = $3; new->ac_init_func = writer_init_trail; + new->ac_write_func = writer_write_trail; writer_q_init(new); $$ = new; } ==== //depot/projects/trustedbsd/netauditd/netauditd.h#13 (text+ko) ==== @@ -38,12 +38,11 @@ struct audit_record { void *ar_buf; u_int32_t ar_record_len; - int ar_refcount; }; struct au_queue_ent { TAILQ_ENTRY(au_queue_ent) aq_glue; - struct audit_record *aq_record; + struct audit_record aq_record; u_int32_t aq_remain; }; @@ -51,12 +50,12 @@ struct au_qpair { au_q_t qp_a, qp_b; - int qp_ready; - au_q_t *qp_read, *qp_write; pthread_mutex_t qp_lock; - pthread_cond_t qp_cond; - u_int32_t qp_read_size; - time_t qp_time; + au_q_t *qp_store; + au_q_t *qp_hold; + au_q_t *qp_free; + u_int32_t qp_store_len; + int qp_store_n; }; struct au_cmpnt { @@ -76,6 +75,7 @@ int (*ac_init_func)(struct au_cmpnt *); int (*ac_read_func)(struct au_cmpnt *); + int (*ac_write_func)(struct au_cmpnt *); }; struct au_src_buffer { ==== //depot/projects/trustedbsd/netauditd/reader.c#2 (text+ko) ==== @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -43,22 +44,27 @@ #include "reader.h" #include "writer.h" -#define ROTATE(x) if (x.qp_read == &x.qp_a) { \ - x.qp_read = &x.qp_b; \ - x.qp_write = &x.qp_a; \ - } \ - else { \ - x.qp_read = &x.qp_a; \ - x.qp_write = &x.qp_b; \ - } \ - x.qp_read_size = 0; \ - x.qp_time = time(NULL); - #define SRC_BUFFER_INIT(x) x = malloc(sizeof(struct au_src_buffer)); \ assert (x != NULL); \ bzero(x, sizeof(struct au_src_buffer)); -static int srcs_online; /* All source components online */ +#define WRITER_SIGNAL(x) (void) pthread_mutex_lock(&ready_lock); \ + records_waiting += x; \ + x = 0; \ + (void) pthread_cond_signal(&ready_cond); \ + (void) pthread_mutex_unlock(&ready_lock) + +#define ROTATE assert(ac->ac_q.qp_free != NULL); \ + ac->ac_q.qp_hold = ac->ac_q.qp_store; \ + ac->ac_q.qp_store = ac->ac_q.qp_free; \ + ac->ac_q.qp_free = NULL; \ + ac->ac_q.qp_store_len = 0 + +pthread_mutex_t ready_lock; +pthread_cond_t ready_cond; +u_int32_t records_waiting; + +static fd_set rfds; int reader_accept_client(struct au_cmpnt *ac) @@ -82,6 +88,7 @@ bcopy(&addr, &new->as_addr, sizeof(new->as_addr)); new->as_addrlen = addrlen; TAILQ_INSERT_TAIL(&ac->ac_sbuffers, new, as_glue); + reader_build_rfds(&rfds); return (0); } @@ -89,25 +96,30 @@ reader_build_rfds(fd_set *rfds) { struct au_cmpnt *ac; + struct au_src_buffer *s; FD_ZERO(rfds); TAILQ_FOREACH(ac, &ac_list_src, ac_glue) { - if (ac->ac_flags & FLAG_ONLINE) - FD_SET(ac->ac_fd, rfds); + FD_SET(ac->ac_fd, rfds); + if (ac->ac_type == COMPONENT_NET) { + TAILQ_FOREACH(s, &ac->ac_sbuffers, as_glue) + FD_SET(s->as_fd, rfds); + } } } void reader_handler(fd_set *rfds) { - struct au_cmpnt *ac, *tmp; + struct au_src_buffer *as, *tmp; + struct au_cmpnt *ac; fd_set lrfds; struct timeval tv; int ret, ret2; lrfds = *rfds; bzero(&tv, sizeof(struct timeval)); - tv.tv_sec = 1; + tv.tv_sec = 5; ret = select(FD_SETSIZE, &lrfds, NULL, NULL, &tv); if (ret == -1) { if (errno == EINTR) @@ -115,15 +127,22 @@ else exit(2); } - else if (ret == 0) + else if (ret == 0) { + reader_timeout(); return; - TAILQ_FOREACH_SAFE(ac, &ac_list_src, ac_glue, tmp) { + } + TAILQ_FOREACH(ac, &ac_list_src, ac_glue) { if (FD_ISSET(ac->ac_fd, &lrfds)) { ret2 = ac->ac_read_func(ac); - if (ret2 == -1) { - (void) close(ac->ac_fd); - ac->ac_flags &= FLAG_ONLINE; - } + if (ret2 == -1) + exit(2); + } + if (ac->ac_type == COMPONENT_NET) { + TAILQ_FOREACH_SAFE(as, &ac->ac_sbuffers, as_glue, + tmp) + if (FD_ISSET(as->as_fd, &lrfds)) { + ret2 = reader_read_socket(as); + } } } } @@ -131,30 +150,13 @@ void reader_init() { - time_t t; struct au_cmpnt *ac; - srcs_online = 1; - TAILQ_FOREACH(ac, &ac_list_src, ac_glue) { - if (ac->ac_flags & FLAG_ONLINE) - continue; - t = time(NULL); - if (ac->ac_failed != 0) - if ((ac->ac_failed + READER_RETRY) > t) { - srcs_online = 0; - continue; - } - dprintf("reader_init: %s", ac->ac_name); - if (ac->ac_init_func(ac) == -1) { - srcs_online = 0; - ac->ac_failed = time(NULL); - } - else { - dprintf("reader_init: %s online", ac->ac_name); - ac->ac_failed = 0; - ac->ac_flags |= FLAG_ONLINE; - } - } + (void) pthread_mutex_init(&ready_lock, NULL); + (void) pthread_cond_init(&ready_cond, NULL); + TAILQ_FOREACH(ac, &ac_list_src, ac_glue) + if (ac->ac_init_func(ac) == -1) + exit(2); } int @@ -205,50 +207,51 @@ for (i = 0; i < ac->ac_ndsts; i++) reader_q_record_cmpnt(ar, ac->ac_dsts[i]); + /* Once we have copied the record to all this components consumers + * we can discard it. */ + free(ar->ar_buf); + free(ar); } void reader_q_record_cmpnt(struct audit_record *ar, struct au_cmpnt *ac) { struct au_queue_ent *new; - int rotate = 0; - time_t t; - t = time(NULL); - if (ac->ac_q.qp_time == 0) - ac->ac_q.qp_time = t; - else if ((ac->ac_q.qp_time + WRITER_ROTATE_TIMEOUT) <= t) { - if (!TAILQ_EMPTY(ac->ac_q.qp_read)) - rotate = 1; - } - if (ac->ac_q.qp_read_size >= WRITER_LOW_WATER) - rotate = 1; - if (rotate) { - if (pthread_mutex_lock(&ac->ac_q.qp_lock) != 0) - exit(2); - /* If the writer is still processing the other buffer, the - * record is dropped. */ - if (!ac->ac_q.qp_ready) { - if (pthread_mutex_unlock(&ac->ac_q.qp_lock) != 0) - exit(2); - return; - } - dprintf("reader_q_record_cmpnt: %s: rotate", ac->ac_name); - ROTATE(ac->ac_q); - if (pthread_cond_signal(&ac->ac_q.qp_cond) != 0) - exit(2); - if (pthread_mutex_unlock(&ac->ac_q.qp_lock) != 0) - exit(2); - } - dprintf("reader_q_record: %p for %s", ar, ac->ac_name); new = malloc(sizeof(struct au_queue_ent)); assert(new != NULL); bzero(new, sizeof(struct au_queue_ent)); - new->aq_record = ar; + new->aq_record.ar_buf = malloc(ar->ar_record_len); + assert(new->aq_record.ar_buf != NULL); + bcopy(ar->ar_buf, new->aq_record.ar_buf, ar->ar_record_len); + new->aq_record.ar_record_len = ar->ar_record_len; new->aq_remain = ar->ar_record_len; - ar->ar_refcount++; - TAILQ_INSERT_TAIL(ac->ac_q.qp_read, new, aq_glue); - ac->ac_q.qp_read_size += ar->ar_record_len; + (void) pthread_mutex_lock(&ac->ac_q.qp_lock); + if (ac->ac_q.qp_store_len < WRITER_MAX) { + dprintf("queueing record for %s (%d bytes in queue)", + ac->ac_name, ac->ac_q.qp_store_len); + (void) pthread_mutex_unlock(&ac->ac_q.qp_lock); + TAILQ_INSERT_TAIL(ac->ac_q.qp_store, new, aq_glue); + ac->ac_q.qp_store_len += ar->ar_record_len; + ac->ac_q.qp_store_n++; + return; + } + if (ac->ac_q.qp_hold != NULL) { + /* This consumer is still processing it's queue, so the record + * is dropped. */ + (void) pthread_mutex_unlock(&ac->ac_q.qp_lock); + dprintf("dropping record for %s", ac->ac_name); + free(new->aq_record.ar_buf); + free(new); + return; + } + dprintf("rotating queues for %s", ac->ac_name); + ROTATE; + WRITER_SIGNAL(ac->ac_q.qp_store_n); + (void) pthread_mutex_unlock(&ac->ac_q.qp_lock); + TAILQ_INSERT_TAIL(ac->ac_q.qp_store, new, aq_glue); + ac->ac_q.qp_store_len += ar->ar_record_len; + ac->ac_q.qp_store_n++; } int @@ -279,16 +282,96 @@ return (0); } +int +reader_read_socket(struct au_src_buffer *asb) +{ + u_char *bufptr, *recbufptr; + int ret, left; + u_int32_t hdr_remain, val, need; + u_char as_buf[2048]; + + ret = read(asb->as_fd, as_buf, sizeof(as_buf)); + if (ret == -1) { + if (errno != EINTR) + return (-1); + else + return (0); + } + else if (ret == 0) + return (-1); + left = ret; + bufptr = as_buf; + while (left > 0) { + if (asb->as_record == NULL) { + hdr_remain = sizeof(asb->as_header) - + asb->as_nread; + if (left >= hdr_remain) { + (void) memcpy(asb->as_header + asb->as_nread, + bufptr, hdr_remain); + asb->as_nread += hdr_remain; + left -= hdr_remain; + bufptr += hdr_remain; + (void) memcpy(&val, asb->as_header + 1, + sizeof(val)); + asb->as_record = + malloc(sizeof(struct audit_record)); + assert(asb->as_record != NULL); + asb->as_record->ar_record_len = be32toh(val); + asb->as_record->ar_buf = \ + malloc(asb->as_record->ar_record_len); + assert(asb->as_record->ar_buf != NULL); + (void) memcpy(asb->as_record->ar_buf, + asb->as_header, sizeof(asb->as_header)); + continue; + } + else { + (void) memcpy(asb->as_header + asb->as_nread, + bufptr, left); + asb->as_nread += left; + return (0); + } + } + need = asb->as_record->ar_record_len - asb->as_nread; + recbufptr = asb->as_record->ar_buf + asb->as_nread; + if (left < need) { + (void) memcpy(recbufptr, bufptr, left); + asb->as_nread += left; + return (0); + } + else { + (void) memcpy(recbufptr, bufptr, need); + left -= need; + bufptr += need; + reader_q_record(asb->as_record, asb->as_parent); + asb->as_record = NULL; + asb->as_nread = 0; + } + } + return (0); +} + void reader_start() { - fd_set rfds; + reader_init(); + reader_build_rfds(&rfds); + for (;;) + reader_handler(&rfds); +} + +void +reader_timeout() +{ + struct au_cmpnt *ac; - for (;;) { - if (!srcs_online) { - reader_init(); - reader_build_rfds(&rfds); + TAILQ_FOREACH(ac, &ac_list_dst, ac_glue) { + (void) pthread_mutex_lock(&ac->ac_q.qp_lock); + if ((ac->ac_q.qp_hold != NULL) || (ac->ac_q.qp_store_n == 0)) { + (void) pthread_mutex_unlock(&ac->ac_q.qp_lock); + continue; } - reader_handler(&rfds); + ROTATE; + WRITER_SIGNAL(ac->ac_q.qp_store_n); + (void) pthread_mutex_unlock(&ac->ac_q.qp_lock); } } ==== //depot/projects/trustedbsd/netauditd/reader.h#2 (text+ko) ==== @@ -24,7 +24,9 @@ * SUCH DAMAGE. */ -#define READER_RETRY 30 +extern pthread_mutex_t ready_lock; +extern pthread_cond_t ready_cond; +u_int32_t records_waiting; int reader_accept_client(struct au_cmpnt *); void reader_build_rfds(fd_set *); @@ -35,4 +37,6 @@ void reader_q_record(struct audit_record *, struct au_cmpnt *); void reader_q_record_cmpnt(struct audit_record *, struct au_cmpnt *); int reader_read_pipe(struct au_cmpnt *); +int reader_read_socket(struct au_src_buffer *); void reader_start(void); +void reader_timeout(void); ==== //depot/projects/trustedbsd/netauditd/writer.c#2 (text+ko) ==== @@ -61,13 +61,14 @@ void writer_handler(fd_set *wfds) { + struct au_cmpnt *ac; fd_set lwfds; struct timeval *tv = NULL; - int ret; + int ret, have_records = 1; lwfds = *wfds; if (!dsts_online) { - dprintf("writer_handler: applying select timeout"); + dprintf("writer applying select timeout"); tv = malloc(sizeof(struct timeval)); bzero(tv, sizeof(struct timeval)); tv->tv_sec = 1; @@ -79,6 +80,34 @@ else exit(2); } + (void) pthread_mutex_lock(&ready_lock); + if (records_waiting == 0) { + have_records = 0; + if (dsts_online) { + while (records_waiting == 0) { + dprintf("writer waiting for records"); + (void) pthread_cond_wait(&ready_cond, + &ready_lock); + } + have_records = 1; + (void) pthread_mutex_unlock(&ready_lock); + } + } + (void) pthread_mutex_unlock(&ready_lock); + if (!have_records) + return; + TAILQ_FOREACH(ac, &ac_list_dst, ac_glue) { + if (!FD_ISSET(ac->ac_fd, &lwfds)) + continue; + (void) pthread_mutex_lock(&ac->ac_q.qp_lock); + if (ac->ac_q.qp_hold != NULL) { + (void) pthread_mutex_unlock(&ac->ac_q.qp_lock); + ret = ac->ac_write_func(ac); + if (ret == 1) /* Queue has been drained */ + writer_q_drained(ac); + } + (void) pthread_mutex_unlock(&ac->ac_q.qp_lock); + } } void @@ -153,16 +182,25 @@ } void +writer_q_drained(struct au_cmpnt *ac) +{ + (void) pthread_mutex_lock(&ac->ac_q.qp_lock); + assert(ac->ac_q.qp_hold != NULL); + ac->ac_q.qp_free = ac->ac_q.qp_hold; + ac->ac_q.qp_hold = NULL; + (void) pthread_mutex_unlock(&ac->ac_q.qp_lock); +} + +void writer_q_init(struct au_cmpnt *ac) { TAILQ_INIT(&ac->ac_q.qp_a); TAILQ_INIT(&ac->ac_q.qp_b); - ac->ac_q.qp_read = &ac->ac_q.qp_a; - ac->ac_q.qp_write = &ac->ac_q.qp_b; + ac->ac_q.qp_store = &ac->ac_q.qp_a; + ac->ac_q.qp_free = &ac->ac_q.qp_b; + ac->ac_q.qp_hold = NULL; if (pthread_mutex_init(&ac->ac_q.qp_lock, NULL) != 0) exit(2); - if (pthread_cond_init(&ac->ac_q.qp_cond, NULL) != 0) - exit(2); } void * @@ -179,3 +217,42 @@ } return (NULL); } + +int +writer_write_trail(struct au_cmpnt *ac) +{ + struct au_queue_ent *aq, *tmp; + struct audit_record *ar; + u_int32_t offset; + int ret; + + TAILQ_FOREACH_SAFE(aq, ac->ac_q.qp_hold, aq_glue, tmp) { + ar = &aq->aq_record; + offset = ar->ar_record_len - aq->aq_remain; + dprintf("write offset %d", offset); + ret = write(ac->ac_fd, ar->ar_buf + offset, aq->aq_remain); + if (ret == -1) { + if ((errno == EINTR) || (errno == EAGAIN)) + return (0); + else + return (-1); + } + else if (ret == aq->aq_remain) { + dprintf("wrote %d bytes to %s (completed)", ret, + ac->ac_name); + (void) pthread_mutex_lock(&ready_lock); + records_waiting--; + dprintf("%d records waiting", records_waiting); + (void) pthread_mutex_unlock(&ready_lock); + TAILQ_REMOVE(ac->ac_q.qp_hold, aq, aq_glue); + free(aq->aq_record.ar_buf); + free(aq); + } + else { + dprintf("partial write"); + aq->aq_remain -= ret; + return (0); + } + } + return (1); +} ==== //depot/projects/trustedbsd/netauditd/writer.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -#define WRITER_LOW_WATER 1024000 +#define WRITER_MAX 32768 #define WRITER_ROTATE_TIMEOUT 5 #define WRITER_RETRY 60 @@ -33,5 +33,7 @@ void writer_init(void); int writer_init_net(struct au_cmpnt *); int writer_init_trail(struct au_cmpnt *); +void writer_q_drained(struct au_cmpnt *); void writer_q_init(struct au_cmpnt *); void *writer_start(void *); +int writer_write_trail(struct au_cmpnt *); From owner-p4-projects@FreeBSD.ORG Sun Apr 6 06:46:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 938211065678; Sun, 6 Apr 2008 06:46:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55701106564A for ; Sun, 6 Apr 2008 06:46:47 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3CB7F8FC14 for ; Sun, 6 Apr 2008 06:46:47 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m366klR6018526 for ; Sun, 6 Apr 2008 06:46:47 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m366kllw018524 for perforce@freebsd.org; Sun, 6 Apr 2008 06:46:47 GMT (envelope-from sam@freebsd.org) Date: Sun, 6 Apr 2008 06:46:47 GMT Message-Id: <200804060646.m366kllw018524@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 Cc: Subject: PERFORCE change 139442 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2008 06:46:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=139442 Change 139442 by sam@sam_ebb on 2008/04/06 06:46:38 o turn off bgscan for now; it doesn't appear to bring us back to the home channel o only issue CONFIG on INIT -> SCAN state change; other cases such as RUN -> SCAN need to not do this or the firmware goes belly up o remove IWI_DISASSOC requests if found associated when we need to push the firmware; this doesn't appear to work, we'll need to add it back in as we hit the cases (need to wait for disassoc to complete before doing further work) o handle spontaneous deauth (e.g. when inactive); clock the state machine to SCAN o remote soft locking arond iwi_init on firmware restart; this doesn't work; need to revisit when we attack firmware error handling wpa_supplicant now recovers from spontaneous deauth. Once bgscan is working again we'll be able to bypass the scan and reassociate directly like other drivers. Affected files ... .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#18 edit Differences ... ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#18 (text+ko) ==== @@ -395,7 +395,9 @@ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_WPA /* 802.11i */ | IEEE80211_C_WME /* 802.11e */ +#if 0 | IEEE80211_C_BGSCAN /* capable of bg scanning */ +#endif ; /* read MAC address from EEPROM */ @@ -1003,12 +1005,11 @@ IWI_UNLOCK(sc); break; case IEEE80211_S_SCAN: + if (vap->iv_state != IEEE80211_S_INIT) + break; iwi_queue_cmd(sc, IWI_CONFIG, 0); return EINPROGRESS; case IEEE80211_S_AUTH: - /* The firmware will fail if we are already associated */ - if (sc->flags & IWI_FLAG_ASSOCIATED) - iwi_queue_cmd(sc, IWI_DISASSOC, 0); iwi_queue_cmd(sc, IWI_AUTH, arg); return EINPROGRESS; case IEEE80211_S_RUN: @@ -1034,9 +1035,6 @@ */ if (vap->iv_state == IEEE80211_S_AUTH) break; - /* The firmware will fail if we are already associated */ - if (sc->flags & IWI_FLAG_ASSOCIATED) - iwi_queue_cmd(sc, IWI_DISASSOC, 0); iwi_queue_cmd(sc, IWI_ASSOC, arg); return EINPROGRESS; default: @@ -1477,10 +1475,20 @@ &IWI_VAP(vap)->iwi_authsuccess_task); break; case IWI_AUTH_FAIL: - DPRINTFN(2, ("Authentication failed\n")); + /* + * These are delivered as an unsolicited deauth + * (e.g. due to inactivity) or in response to an + * associate request. + */ sc->flags &= ~IWI_FLAG_ASSOCIATED; - IWI_STATE_END(sc, IWI_FW_ASSOCIATING); - /* XXX */ + if (vap->iv_state != IEEE80211_S_RUN) { + DPRINTFN(2, ("Authentication failed\n")); + IWI_STATE_END(sc, IWI_FW_ASSOCIATING); + } else { + DPRINTFN(2, ("Deauthenticated\n")); + } + taskqueue_enqueue(taskqueue_swi, + &IWI_VAP(vap)->iwi_assocfailed_task); break; case IWI_AUTH_SENT_1: case IWI_AUTH_RECV_2: @@ -1526,8 +1534,8 @@ case IWI_FW_DISASSOCIATING: DPRINTFN(2, ("Dissassociated\n")); - IWI_STATE_END(sc, - IWI_FW_DISASSOCIATING); + IWI_STATE_END(sc, IWI_FW_DISASSOCIATING); + /* XXX what next? */ break; } sc->flags &= ~IWI_FLAG_ASSOCIATED; @@ -3252,13 +3260,10 @@ iwi_restart(void *arg, int npending) { struct iwi_softc *sc = arg; - IWI_LOCK_DECL; - IWI_LOCK(sc); /* XXX not right */ if (sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) iwi_init(sc); - IWI_UNLOCK(sc); } /* From owner-p4-projects@FreeBSD.ORG Sun Apr 6 14:42:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E585F1065674; Sun, 6 Apr 2008 14:42:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ABA891065672 for ; Sun, 6 Apr 2008 14:42:17 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 907318FC23 for ; Sun, 6 Apr 2008 14:42:17 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m36EgHYS079487 for ; Sun, 6 Apr 2008 14:42:17 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m36EgHsD079485 for perforce@freebsd.org; Sun, 6 Apr 2008 14:42:17 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 6 Apr 2008 14:42:17 GMT Message-Id: <200804061442.m36EgHsD079485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 139455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2008 14:42:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=139455 Change 139455 by gonzo@gonzo_jeeves on 2008/04/06 14:41:17 o ACK TX interrupt by writing to Status register of DMA channel 1 (tx) o sync TX descriptors after all operations has been performed on them o We should care only about F and E interrupts for TX descriptor. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/if_kr.c#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/if_kr.c#3 (text+ko) ==== @@ -1425,6 +1425,9 @@ } sc->kr_cdata.kr_tx_cons = cons; + + bus_dmamap_sync(sc->kr_cdata.kr_tx_ring_tag, + sc->kr_cdata.kr_tx_ring_map, BUS_DMASYNC_PREWRITE); } @@ -1574,9 +1577,11 @@ device_printf(sc->kr_dev, "DMA error\n"); } - /* Enable F, H, E interrupts */ + KR_DMA_WRITE_REG(KR_DMA_TXCHAN, DMA_S, ~status); + + /* Enable F, E interrupts */ KR_DMA_CLEARBITS_REG(KR_DMA_TXCHAN, DMA_SM, - DMA_SM_D | DMA_SM_H | DMA_SM_E); + DMA_SM_F | DMA_SM_E); KR_UNLOCK(sc); From owner-p4-projects@FreeBSD.ORG Sun Apr 6 15:39:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6290B106567C; Sun, 6 Apr 2008 15:39:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24FEE1065677 for ; Sun, 6 Apr 2008 15:39:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 09A918FC0C for ; Sun, 6 Apr 2008 15:39:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m36FdGbP082955 for ; Sun, 6 Apr 2008 15:39:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m36FdGR1082953 for perforce@freebsd.org; Sun, 6 Apr 2008 15:39:16 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Apr 2008 15:39:16 GMT Message-Id: <200804061539.m36FdGR1082953@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 139459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2008 15:39:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=139459 Change 139459 by hselasky@hselasky_laptop001 on 2008/04/06 15:38:58 Compile fixes for NetBSD. The commit does not affect resulting code when compiling on FreeBSD. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#104 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#102 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#104 (text+ko) ==== @@ -2952,24 +2952,15 @@ *------------------------------------------------------------------------*/ static void usbd_pc_common_mem_cb(struct usbd_page_cache *pc, bus_dma_segment_t *segs, - int nseg, int error, uint8_t isload) + int nseg, int error, uint8_t isload, uint8_t dolock) { struct usbd_dma_parent_tag *uptag; - struct usbd_xfer *xfer; struct usbd_page *pg; uint32_t rem; - uint8_t owned; uint8_t ext_seg; /* extend last segment */ uptag = pc->tag_parent; - /* - * XXX There is sometimes recursive locking here. - * XXX We should try to find a better solution. - * XXX Until further the "owned" variable does - * XXX the trick. - */ - if (error) { goto done; } @@ -3002,17 +2993,14 @@ (pg + 1)->physaddr = pg->physaddr + USB_PAGE_SIZE; } done: - owned = mtx_owned(uptag->mtx); - if (!owned) + if (dolock) mtx_lock(uptag->mtx); uptag->dma_error = (error ? 1 : 0); if (isload) { (uptag->func) (uptag); - } else { - cv_broadcast(uptag->cv); } - if (!owned) + if (dolock) mtx_unlock(uptag->mtx); return; } @@ -3029,6 +3017,7 @@ uint32_t size, uint32_t align) { struct usbd_dma_parent_tag *uptag; + struct usbd_dma_tag *utag; caddr_t ptr = NULL; bus_dmamap_t map; int seg_count; @@ -3090,7 +3079,7 @@ pc->tag = utag->tag; pc->ismultiseg = (align == 1); - usbd_pc_common_mem_cb(pc, utag->p_seg, seg_count, 0, 0); + usbd_pc_common_mem_cb(pc, utag->p_seg, seg_count, 0, 0, 1); bzero(ptr, size); @@ -3099,13 +3088,13 @@ return (0); done_0: - bus_dmamap_unload(tag, map); + bus_dmamap_unload(utag->tag, map); done_1: - bus_dmamap_destroy(tag, map); + bus_dmamap_destroy(utag->tag, map); done_2: - bus_dmamem_unmap(tag, ptr, size); + bus_dmamem_unmap(utag->tag, ptr, size); done_3: - bus_dmamem_free(tag, utag->p_seg, seg_count); + bus_dmamem_free(utag->tag, utag->p_seg, seg_count); done_4: /* utag is destroyed later */ done_5: @@ -3847,8 +3836,10 @@ /* something is corrupt */ return; } +#ifdef __FreeBSD__ /* initialise condition variable */ cv_init(udpt->cv, "USB DMA CV"); +#endif /* store some information */ udpt->mtx = mtx; @@ -3890,8 +3881,10 @@ } if (udpt->utag_max) { +#ifdef __FreeBSD__ /* destroy the condition variable */ cv_destroy(udpt->cv); +#endif } return; } ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#102 (text+ko) ==== @@ -417,7 +417,9 @@ * The following structure describes the parent USB DMA tag. */ struct usbd_dma_parent_tag { +#ifdef __FreeBSD__ struct cv cv[1]; /* internal condition variable */ +#endif bus_dma_tag_t tag; /* always set */ From owner-p4-projects@FreeBSD.ORG Sun Apr 6 19:46:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B18171065674; Sun, 6 Apr 2008 19:46:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7276D106564A for ; Sun, 6 Apr 2008 19:46:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3EAAB8FC17 for ; Sun, 6 Apr 2008 19:46:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m36JkcMH012369 for ; Sun, 6 Apr 2008 19:46:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m36Jkcbf012367 for perforce@freebsd.org; Sun, 6 Apr 2008 19:46:38 GMT (envelope-from sam@freebsd.org) Date: Sun, 6 Apr 2008 19:46:38 GMT Message-Id: <200804061946.m36Jkcbf012367@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 Cc: Subject: PERFORCE change 139468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2008 19:46:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=139468 Change 139468 by sam@sam_ebb on 2008/04/06 19:45:44 don't hold the softc lock over ieee80211_start_all; there's no need and it's a LOR Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#26 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#26 (text) ==== @@ -2707,9 +2707,9 @@ callout_reset(&sc->watchdog_ch, hz, rt2560_watchdog, sc); + RAL_UNLOCK(sc); + ieee80211_start_all(ic); /* start all vap's */ - - RAL_UNLOCK(sc); #undef N } From owner-p4-projects@FreeBSD.ORG Sun Apr 6 19:46:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 714311065717; Sun, 6 Apr 2008 19:46:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95EB61065671 for ; Sun, 6 Apr 2008 19:46:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 629A18FC1D for ; Sun, 6 Apr 2008 19:46:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m36Jkclf012374 for ; Sun, 6 Apr 2008 19:46:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m36Jkc7a012372 for perforce@freebsd.org; Sun, 6 Apr 2008 19:46:38 GMT (envelope-from sam@freebsd.org) Date: Sun, 6 Apr 2008 19:46:38 GMT Message-Id: <200804061946.m36Jkc7a012372@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 Cc: Subject: PERFORCE change 139469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2008 19:46:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=139469 Change 139469 by sam@sam_ebb on 2008/04/06 19:46:21 move the softc lock to cover setting if_flags in the init method Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2661.c#23 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2661.c#23 (text) ==== @@ -2447,11 +2447,12 @@ /* kick Rx */ RAL_WRITE(sc, RT2661_RX_CNTL_CSR, 1); - RAL_UNLOCK(sc); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; + RAL_UNLOCK(sc); + ieee80211_start_all(ic); /* start all vap's */ #undef N } From owner-p4-projects@FreeBSD.ORG Sun Apr 6 20:21:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B66951065672; Sun, 6 Apr 2008 20:21:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78E94106564A for ; Sun, 6 Apr 2008 20:21:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E62E8FC1C for ; Sun, 6 Apr 2008 20:21:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m36KLHxT014900 for ; Sun, 6 Apr 2008 20:21:17 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m36KLGab014898 for perforce@freebsd.org; Sun, 6 Apr 2008 20:21:16 GMT (envelope-from csjp@freebsd.org) Date: Sun, 6 Apr 2008 20:21:16 GMT Message-Id: <200804062021.m36KLGab014898@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 139471 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2008 20:21:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=139471 Change 139471 by csjp@ibm01 on 2008/04/06 20:20:45 Change the structure of the macros so they are safe to use within loops, if constructs et al. Affected files ... .. //depot/projects/trustedbsd/netauditd/reader.c#3 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/reader.c#3 (text+ko) ==== @@ -44,21 +44,26 @@ #include "reader.h" #include "writer.h" -#define SRC_BUFFER_INIT(x) x = malloc(sizeof(struct au_src_buffer)); \ - assert (x != NULL); \ - bzero(x, sizeof(struct au_src_buffer)); +#define SRC_BUFFER_INIT(x) do { \ + x = calloc(1, sizeof(struct au_src_buffer)); \ + assert(x != NULL); \ +} while (0) -#define WRITER_SIGNAL(x) (void) pthread_mutex_lock(&ready_lock); \ - records_waiting += x; \ - x = 0; \ - (void) pthread_cond_signal(&ready_cond); \ - (void) pthread_mutex_unlock(&ready_lock) +#define WRITER_SIGNAL(x) do { \ + (void) pthread_mutex_lock(&ready_lock); \ + records_waiting += x; \ + x = 0; \ + (void) pthread_cond_signal(&ready_cond); \ + (void) pthread_mutex_unlock(&ready_lock); \ +} while (0) -#define ROTATE assert(ac->ac_q.qp_free != NULL); \ - ac->ac_q.qp_hold = ac->ac_q.qp_store; \ - ac->ac_q.qp_store = ac->ac_q.qp_free; \ - ac->ac_q.qp_free = NULL; \ - ac->ac_q.qp_store_len = 0 +#define ROTATE() do { \ + assert(ac->ac_q.qp_free != NULL); \ + ac->ac_q.qp_hold = ac->ac_q.qp_store; \ + ac->ac_q.qp_store = ac->ac_q.qp_free; \ + ac->ac_q.qp_free = NULL; \ + ac->ac_q.qp_store_len = 0; \ +} while (0) pthread_mutex_t ready_lock; pthread_cond_t ready_cond; @@ -246,7 +251,7 @@ return; } dprintf("rotating queues for %s", ac->ac_name); - ROTATE; + ROTATE(); WRITER_SIGNAL(ac->ac_q.qp_store_n); (void) pthread_mutex_unlock(&ac->ac_q.qp_lock); TAILQ_INSERT_TAIL(ac->ac_q.qp_store, new, aq_glue); @@ -370,7 +375,7 @@ (void) pthread_mutex_unlock(&ac->ac_q.qp_lock); continue; } - ROTATE; + ROTATE(); WRITER_SIGNAL(ac->ac_q.qp_store_n); (void) pthread_mutex_unlock(&ac->ac_q.qp_lock); } From owner-p4-projects@FreeBSD.ORG Sun Apr 6 22:26:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A1551065677; Sun, 6 Apr 2008 22:26:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CBF7106566B for ; Sun, 6 Apr 2008 22:26:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 133168FC19 for ; Sun, 6 Apr 2008 22:26:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m36MQTKC030567 for ; Sun, 6 Apr 2008 22:26:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m36MQT27030565 for perforce@freebsd.org; Sun, 6 Apr 2008 22:26:29 GMT (envelope-from sam@freebsd.org) Date: Sun, 6 Apr 2008 22:26:29 GMT Message-Id: <200804062226.m36MQT27030565@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 Cc: Subject: PERFORCE change 139478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2008 22:26:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=139478 Change 139478 by sam@sam_ebb on 2008/04/06 22:25:48 always use IEEE80211_IOC_SCAN_NOJOIN instead of IEEE80211_IOC_SCAN_NOPICK; this should be equivalent but works around the current behaviour that scan requests with a vap in INIT state are deferred to the state machine at which point we've lost the IEEE80211_IOC_SCAN_CHECK bit to use in deciding wether to call ieee80211_check_scan or ieee80211_scan_start Affected files ... .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#9 edit Differences ... ==== //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#9 (text+ko) ==== @@ -483,6 +483,7 @@ memset(&sr, 0, sizeof(sr)); sr.sr_flags = IEEE80211_IOC_SCAN_ACTIVE | IEEE80211_IOC_SCAN_ONCE + | IEEE80211_IOC_SCAN_NOJOIN ; sr.sr_duration = IEEE80211_IOC_SCAN_FOREVER; if (ssid_len != 0) { @@ -506,12 +507,8 @@ /* NB: clear so we don't retry w/o associating first */ drv->lastssid_len = 0; } - if (sr.sr_nssid != 0) { /* NB: check scan cache first */ - sr.sr_flags |= IEEE80211_IOC_SCAN_CHECK - | IEEE80211_IOC_SCAN_NOJOIN - ; - } else - sr.sr_flags |= IEEE80211_IOC_SCAN_NOPICK; + if (sr.sr_nssid != 0) /* NB: check scan cache first */ + sr.sr_flags |= IEEE80211_IOC_SCAN_CHECK; /* NB: net80211 delivers a scan complete event so no need to poll */ return set80211var(drv, IEEE80211_IOC_SCAN_REQ, &sr, sizeof(sr)); From owner-p4-projects@FreeBSD.ORG Sun Apr 6 22:50:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FCB11065676; Sun, 6 Apr 2008 22:50:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22A621065675 for ; Sun, 6 Apr 2008 22:50:55 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A5798FC12 for ; Sun, 6 Apr 2008 22:50:55 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m36MosDc031582 for ; Sun, 6 Apr 2008 22:50:54 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m36MosJE031580 for perforce@freebsd.org; Sun, 6 Apr 2008 22:50:54 GMT (envelope-from thompsa@freebsd.org) Date: Sun, 6 Apr 2008 22:50:54 GMT Message-Id: <200804062250.m36MosJE031580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 139480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2008 22:50:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=139480 Change 139480 by thompsa@thompsa_burger on 2008/04/06 22:49:58 Fix compile. Affected files ... .. //depot/projects/vap/sys/dev/ipw/if_ipw.c#11 edit Differences ... ==== //depot/projects/vap/sys/dev/ipw/if_ipw.c#11 (text+ko) ==== @@ -1507,7 +1507,6 @@ ipw_tx_start(struct ifnet *ifp, struct mbuf *m0, struct ieee80211_node *ni) { struct ipw_softc *sc = ifp->if_softc; - struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct ieee80211_frame *wh; struct ipw_soft_bd *sbd; @@ -1733,7 +1732,6 @@ ipw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ipw_softc *sc = ifp->if_softc; - struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; int error = 0; @@ -2486,7 +2484,6 @@ struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); - struct ifnet *ifp = ic->ic_ifp; const struct firmware *fp; const struct ipw_firmware_hdr *hdr; const char *imagename, *fw; @@ -2642,7 +2639,6 @@ ipw_stop_locked(struct ipw_softc *sc) { struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; int i; IPW_LOCK_ASSERT(sc); From owner-p4-projects@FreeBSD.ORG Sun Apr 6 22:51:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D67F1065673; Sun, 6 Apr 2008 22:51:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F6C1106564A for ; Sun, 6 Apr 2008 22:51:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 367B48FC1C for ; Sun, 6 Apr 2008 22:51:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m36Mpuvh031758 for ; Sun, 6 Apr 2008 22:51:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m36MpuSi031756 for perforce@freebsd.org; Sun, 6 Apr 2008 22:51:56 GMT (envelope-from sam@freebsd.org) Date: Sun, 6 Apr 2008 22:51:56 GMT Message-Id: <200804062251.m36MpuSi031756@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 Cc: Subject: PERFORCE change 139481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2008 22:51:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=139481 Change 139481 by sam@sam_ebb on 2008/04/06 22:51:46 Shuffle some more code to make the firmware happy: o configuring the adapter cannot be done on each entry to the SCAN state; we must enable the adapter only once after loading firmware so strip down iwi_config to just setup parameters that are vap-independent and call it from iwi_init o move work that used to be done in iwi_config to iwi_auth_and_assoc where it makes more sense (and we have a vap as parameters like rtsthreshold are vap-specific) o change DISASSOC request issues on RUN->INIT state change to also send a frame to the AP o add debug msg to iwi_ops to see the deferred ops being run o widen the cmd arg to unsigned long so we can pass maxdwell using it instead of having a special sc_maxdwell mechanism o change IWI_* defs to integers instead of bits; can't see a reason why they were as they were and having them small values means we can setup an array of strings to debugging I can now roam between wpa-enabled ap's. Affected files ... .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#19 edit .. //depot/projects/vap/sys/dev/iwi/if_iwivar.h#12 edit Differences ... ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#19 (text+ko) ==== @@ -180,7 +180,7 @@ static int iwi_load_ucode(struct iwi_softc *, const struct iwi_fw *); static int iwi_load_firmware(struct iwi_softc *, const struct iwi_fw *); static void iwi_release_fw_dma(struct iwi_softc *sc); -static int iwi_config(struct iwi_softc *, struct ieee80211vap *); +static int iwi_config(struct iwi_softc *); static int iwi_get_firmware(struct iwi_softc *, enum ieee80211_opmode); static void iwi_put_firmware(struct iwi_softc *); static int iwi_scanchan(struct iwi_softc *, unsigned long, int); @@ -194,7 +194,7 @@ #endif static void iwi_scan_mindwell(struct ieee80211_scan_state *); static void iwi_ops(void *, int); -static int iwi_queue_cmd(struct iwi_softc *, int, int); +static int iwi_queue_cmd(struct iwi_softc *, int, unsigned long); static int iwi_auth_and_assoc(struct iwi_softc *, struct ieee80211vap *); static int iwi_disassociate(struct iwi_softc *, int quiet); static void iwi_init(void *); @@ -1001,14 +1001,9 @@ */ if (vap->iv_state == IEEE80211_S_RUN && (sc->flags & IWI_FLAG_FW_INITED)) - iwi_queue_cmd(sc, IWI_DISASSOC, 0); + iwi_queue_cmd(sc, IWI_DISASSOC, 1); IWI_UNLOCK(sc); break; - case IEEE80211_S_SCAN: - if (vap->iv_state != IEEE80211_S_INIT) - break; - iwi_queue_cmd(sc, IWI_CONFIG, 0); - return EINPROGRESS; case IEEE80211_S_AUTH: iwi_queue_cmd(sc, IWI_AUTH, arg); return EINPROGRESS; @@ -2575,7 +2570,7 @@ } static int -iwi_config(struct iwi_softc *sc, struct ieee80211vap *vap) +iwi_config(struct iwi_softc *sc) { struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; @@ -2587,9 +2582,9 @@ IWI_LOCK_ASSERT(sc); - IEEE80211_ADDR_COPY(vap->iv_myaddr, IF_LLADDR(ifp)); - DPRINTF(("Setting MAC address to %6D\n", vap->iv_myaddr, ":")); - error = iwi_cmd(sc, IWI_CMD_SET_MAC_ADDRESS, vap->iv_myaddr, + IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp)); + DPRINTF(("Setting MAC address to %6D\n", ic->ic_myaddr, ":")); + error = iwi_cmd(sc, IWI_CMD_SET_MAC_ADDRESS, ic->ic_myaddr, IEEE80211_ADDR_LEN); if (error != 0) return error; @@ -2599,31 +2594,14 @@ config.silence_threshold = 0x1e; config.antenna = sc->antenna; config.multicast_enabled = 1; - config.answer_pbreq = (vap->iv_opmode == IEEE80211_M_IBSS) ? 1 : 0; + config.answer_pbreq = (ic->ic_opmode == IEEE80211_M_IBSS) ? 1 : 0; config.disable_unicast_decryption = 1; config.disable_multicast_decryption = 1; DPRINTF(("Configuring adapter\n")); error = iwi_cmd(sc, IWI_CMD_SET_CONFIG, &config, sizeof config); if (error != 0) return error; - - error = iwi_setpowermode(sc, vap); - if (error != 0) - return error; - - data = htole32(vap->iv_rtsthreshold); - DPRINTF(("Setting RTS threshold to %u\n", le32toh(data))); - error = iwi_cmd(sc, IWI_CMD_SET_RTS_THRESHOLD, &data, sizeof data); - if (error != 0) - return error; - - data = htole32(vap->iv_fragthreshold); - DPRINTF(("Setting fragmentation threshold to %u\n", le32toh(data))); - error = iwi_cmd(sc, IWI_CMD_SET_FRAG_THRESHOLD, &data, sizeof data); - if (error != 0) - return error; - - if (vap->iv_opmode == IEEE80211_M_IBSS) { + if (ic->ic_opmode == IEEE80211_M_IBSS) { power.mode = IWI_MODE_11B; power.nchan = 11; for (i = 0; i < 11; i++) { @@ -2664,32 +2642,12 @@ if (error != 0) return error; - /* if we have a desired ESSID, set it now */ - if (vap->iv_des_ssid[0].len != 0) { -#ifdef IWI_DEBUG - if (iwi_debug > 0) { - printf("Setting desired ESSID to "); - ieee80211_print_essid(vap->iv_des_ssid[0].ssid, - vap->iv_des_ssid[0].len); - printf("\n"); - } -#endif - error = iwi_cmd(sc, IWI_CMD_SET_ESSID, vap->iv_des_ssid[0].ssid, - vap->iv_des_ssid[0].len); - if (error != 0) - return error; - } - data = htole32(arc4random()); DPRINTF(("Setting initialization vector to %u\n", le32toh(data))); error = iwi_cmd(sc, IWI_CMD_SET_IV, &data, sizeof data); if (error != 0) return error; - error = iwi_setwepkeys(sc, vap); - if (error != 0) - return error; - /* enable adapter */ DPRINTF(("Enabling adapter\n")); return iwi_cmd(sc, IWI_CMD_ENABLE, NULL, 0); @@ -2880,6 +2838,7 @@ struct iwi_associate *assoc = &sc->assoc; struct iwi_rateset rs; uint16_t capinfo; + uint32_t data; int error, mode; IWI_LOCK_ASSERT(sc); @@ -2928,6 +2887,22 @@ if (error != 0) goto done; + error = iwi_setpowermode(sc, vap); + if (error != 0) + goto done; + + data = htole32(vap->iv_rtsthreshold); + DPRINTF(("Setting RTS threshold to %u\n", le32toh(data))); + error = iwi_cmd(sc, IWI_CMD_SET_RTS_THRESHOLD, &data, sizeof data); + if (error != 0) + goto done; + + data = htole32(vap->iv_fragthreshold); + DPRINTF(("Setting fragmentation threshold to %u\n", le32toh(data))); + error = iwi_cmd(sc, IWI_CMD_SET_FRAG_THRESHOLD, &data, sizeof data); + if (error != 0) + goto done; + /* the rate set has already been "negotiated" */ memset(&rs, 0, sizeof rs); rs.mode = mode; @@ -3190,18 +3165,24 @@ } sc->flags |= IWI_FLAG_FW_INITED; + IWI_STATE_END(sc, IWI_FW_LOADING); + + if (iwi_config(sc) != 0) { + device_printf(sc->sc_dev, "unable to enable adapter\n"); + goto fail2; + } + callout_reset(&sc->sc_wdtimer, hz, iwi_watchdog, sc); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; - IWI_STATE_END(sc, IWI_FW_LOADING); - IWI_UNLOCK(sc); ieee80211_start_all(ic); /* start all vap's */ return; fail: IWI_STATE_END(sc, IWI_FW_LOADING); +fail2: iwi_stop_locked(sc); IWI_UNLOCK(sc); } @@ -3545,23 +3526,35 @@ static void iwi_ops(void *arg0, int npending) { + static const char *opnames[] = { + [IWI_CMD_FREE] = "FREE", + [IWI_SCAN_START] = "SCAN_START", + [IWI_SET_CHANNEL] = "SET_CHANNEL", + [IWI_AUTH] = "AUTH", + [IWI_ASSOC] = "ASSOC", + [IWI_DISASSOC] = "DISASSOC", + [IWI_SCAN_CURCHAN] = "SCAN_CURCHAN", + [IWI_SCAN_ALLCHAN] = "SCAN_ALLCHAN", + [IWI_SET_WME] = "SET_WME", + }; struct iwi_softc *sc = arg0; struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); IWI_LOCK_DECL; - int cmd, arg; + int cmd; + unsigned long arg; again: IWI_CMD_LOCK(sc); cmd = sc->sc_cmd[sc->sc_cmd_cur]; - if (cmd == 0) { + if (cmd == IWI_CMD_FREE) { /* No more commands to process */ IWI_CMD_UNLOCK(sc); return; } - arg = sc->sc_cmd[sc->sc_cmd_cur]; - sc->sc_cmd[sc->sc_cmd_cur] = 0; /* free the slot */ + arg = sc->sc_arg[sc->sc_cmd_cur]; + sc->sc_cmd[sc->sc_cmd_cur] = IWI_CMD_FREE; /* free the slot */ sc->sc_cmd_cur = (sc->sc_cmd_cur + 1) % IWI_CMD_MAXOPS; IWI_CMD_UNLOCK(sc); @@ -3575,17 +3568,8 @@ return; } + DPRINTF(("%s: %s arg %lu\n", __func__, opnames[cmd], arg)); switch (cmd) { - case IWI_CONFIG: - iwi_config(sc, vap); - IWI_UNLOCK(sc); - IEEE80211_LOCK(ic); - IWI_VAP(vap)->iwi_newstate(vap, IEEE80211_S_SCAN, arg); - if (vap->iv_newstate_cb != NULL) - vap->iv_newstate_cb(vap, IEEE80211_S_SCAN, arg); - IEEE80211_UNLOCK(ic); - IWI_LOCK(sc); - break; case IWI_AUTH: case IWI_ASSOC: if (cmd == IWI_AUTH) @@ -3612,7 +3596,7 @@ __func__)); goto done; } - if (iwi_scanchan(sc, sc->sc_maxdwell, cmd)) + if (iwi_scanchan(sc, arg, cmd)) ieee80211_cancel_scan(vap); break; } @@ -3624,7 +3608,7 @@ } static int -iwi_queue_cmd(struct iwi_softc *sc, int cmd, int arg) +iwi_queue_cmd(struct iwi_softc *sc, int cmd, unsigned long arg) { IWI_CMD_LOCK(sc); if (sc->sc_cmd[sc->sc_cmd_next] != 0) { @@ -3666,8 +3650,7 @@ struct ifnet *ifp = vap->iv_ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - sc->sc_maxdwell = maxdwell; - iwi_queue_cmd(sc, IWI_SCAN_CURCHAN, 0); + iwi_queue_cmd(sc, IWI_SCAN_CURCHAN, maxdwell); } #if 0 @@ -3677,8 +3660,7 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - sc->sc_maxdwell = maxdwell; - iwi_queue_cmd(sc, IWI_SCAN_ALLCHAN, 0); + iwi_queue_cmd(sc, IWI_SCAN_ALLCHAN, maxdwell); } #endif ==== //depot/projects/vap/sys/dev/iwi/if_iwivar.h#12 (text+ko) ==== @@ -220,22 +220,20 @@ int sc_state_timer; /* firmware state timer */ int sc_busy_timer; /* firmware cmd timer */ -#define IWI_SCAN_START (1 << 0) -#define IWI_SET_CHANNEL (1 << 1) -#define IWI_SCAN_END (1 << 2) -#define IWI_CONFIG (1 << 3) -#define IWI_AUTH (1 << 4) -#define IWI_ASSOC (1 << 5) -#define IWI_DISASSOC (1 << 6) -#define IWI_SCAN_CURCHAN (1 << 7) -#define IWI_SCAN_ALLCHAN (1 << 8) -#define IWI_SET_WME (1 << 9) #define IWI_CMD_MAXOPS 10 int sc_cmd[IWI_CMD_MAXOPS]; - int sc_arg[IWI_CMD_MAXOPS]; + unsigned long sc_arg[IWI_CMD_MAXOPS]; int sc_cmd_cur; /* current queued scan task */ int sc_cmd_next; /* last queued scan task */ - unsigned long sc_maxdwell; /* max dwell time for curchan */ +#define IWI_CMD_FREE 0 /* for marking slots unused */ +#define IWI_SCAN_START 1 +#define IWI_SET_CHANNEL 2 +#define IWI_AUTH 3 +#define IWI_ASSOC 4 +#define IWI_DISASSOC 5 +#define IWI_SCAN_CURCHAN 6 +#define IWI_SCAN_ALLCHAN 7 +#define IWI_SET_WME 8 struct iwi_rx_radiotap_header sc_rxtap; int sc_rxtap_len; From owner-p4-projects@FreeBSD.ORG Sun Apr 6 23:02:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9CF31065678; Sun, 6 Apr 2008 23:02:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99E63106564A for ; Sun, 6 Apr 2008 23:02:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 810088FC1E for ; Sun, 6 Apr 2008 23:02:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m36N27TQ032089 for ; Sun, 6 Apr 2008 23:02:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m36N26LL032087 for perforce@freebsd.org; Sun, 6 Apr 2008 23:02:06 GMT (envelope-from jb@freebsd.org) Date: Sun, 6 Apr 2008 23:02:06 GMT Message-Id: <200804062302.m36N26LL032087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 139482 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2008 23:02:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=139482 Change 139482 by jb@jb_freebsd1 on 2008/04/06 23:01:59 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#67 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#13 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#63 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/Makefile#7 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/jails/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/translators.ent#4 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/network-servers/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#31 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#14 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml#14 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/jails/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ports/chapter.sgml#14 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#24 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/disks/chapter.sgml#5 integrate .. //depot/projects/dtrace/ports/GIDs#19 integrate .. //depot/projects/dtrace/ports/KNOBS#14 integrate .. //depot/projects/dtrace/ports/LEGAL#38 integrate .. //depot/projects/dtrace/ports/MOVED#74 integrate .. //depot/projects/dtrace/ports/Mk/bsd.database.mk#10 integrate .. //depot/projects/dtrace/ports/Mk/bsd.openssl.mk#7 integrate .. //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#10 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#26 integrate .. //depot/projects/dtrace/ports/UIDs#23 integrate .. //depot/projects/dtrace/ports/UPDATING#64 integrate .. //depot/projects/dtrace/src/Makefile#20 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#42 integrate .. //depot/projects/dtrace/src/bin/ls/ls.1#6 integrate .. //depot/projects/dtrace/src/bin/ls/ls.c#4 integrate .. //depot/projects/dtrace/src/bin/ls/ls.h#4 integrate .. //depot/projects/dtrace/src/bin/ls/print.c#5 integrate .. //depot/projects/dtrace/src/bin/ls/util.c#4 integrate .. //depot/projects/dtrace/src/contrib/netcat/nc.1#5 integrate .. //depot/projects/dtrace/src/contrib/netcat/netcat.c#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/ppp#11 integrate .. //depot/projects/dtrace/src/etc/rc.d/zfs#3 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#31 integrate .. //depot/projects/dtrace/src/include/complex.h#6 integrate .. //depot/projects/dtrace/src/include/stdio.h#8 integrate .. //depot/projects/dtrace/src/include/unistd.h#12 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/dtrace/src/lib/libc/gen/err.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/msgctl.3#5 integrate .. //depot/projects/dtrace/src/lib/libc/include/libc_private.h#7 integrate .. //depot/projects/dtrace/src/lib/libc/include/namespace.h#6 integrate .. //depot/projects/dtrace/src/lib/libc/include/un-namespace.h#6 integrate .. //depot/projects/dtrace/src/lib/libc/rpc/svc_vc.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdtime/localtime.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#9 integrate .. //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#9 integrate .. //depot/projects/dtrace/src/lib/libc/sys/aio_cancel.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/aio_suspend.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/dtrace/src/lib/libc/xdr/xdr_rec.c#4 integrate .. //depot/projects/dtrace/src/lib/libstand/nfs.c#4 integrate .. //depot/projects/dtrace/src/lib/libthr/arch/amd64/Makefile.inc#5 integrate .. //depot/projects/dtrace/src/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/dtrace/src/lib/libthr/arch/amd64/include/pthread_md.h#5 integrate .. //depot/projects/dtrace/src/lib/libthr/arch/i386/Makefile.inc#5 integrate .. //depot/projects/dtrace/src/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/dtrace/src/lib/libthr/arch/i386/include/pthread_md.h#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_affinity.c#3 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_cond.c#9 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#19 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_rtld.c#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_rwlock.c#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.c#12 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.h#10 integrate .. //depot/projects/dtrace/src/lib/msun/Makefile#14 integrate .. //depot/projects/dtrace/src/lib/msun/Symbol.map#12 integrate .. //depot/projects/dtrace/src/lib/msun/amd64/Makefile.inc#8 integrate .. //depot/projects/dtrace/src/lib/msun/amd64/e_remainderl.S#1 branch .. //depot/projects/dtrace/src/lib/msun/amd64/s_remquol.S#1 branch .. //depot/projects/dtrace/src/lib/msun/i387/Makefile.inc#8 integrate .. //depot/projects/dtrace/src/lib/msun/i387/e_remainderl.S#1 branch .. //depot/projects/dtrace/src/lib/msun/i387/s_remquol.S#1 branch .. //depot/projects/dtrace/src/lib/msun/man/csqrt.3#2 integrate .. //depot/projects/dtrace/src/lib/msun/man/hypot.3#6 integrate .. //depot/projects/dtrace/src/lib/msun/man/remainder.3#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/e_hypot.c#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/e_hypotf.c#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/e_hypotl.c#1 branch .. //depot/projects/dtrace/src/lib/msun/src/e_remainder.c#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/e_remainderl.c#1 branch .. //depot/projects/dtrace/src/lib/msun/src/math.h#11 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_csqrt.c#3 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_csqrtl.c#1 branch .. //depot/projects/dtrace/src/lib/msun/src/s_fma.c#4 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_fmal.c#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_remquo.c#4 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_remquol.c#1 branch .. //depot/projects/dtrace/src/lib/msun/src/w_cabs.c#6 integrate .. //depot/projects/dtrace/src/lib/msun/src/w_cabsl.c#1 branch .. //depot/projects/dtrace/src/libexec/rtld-elf/mips/reloc.c#1 branch .. //depot/projects/dtrace/src/libexec/rtld-elf/mips/rtld_machdep.h#1 branch .. //depot/projects/dtrace/src/libexec/rtld-elf/mips/rtld_start.S#1 branch .. //depot/projects/dtrace/src/libexec/rtld-elf/rtld.c#8 integrate .. //depot/projects/dtrace/src/libexec/rtld-elf/rtld.h#5 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#20 integrate .. //depot/projects/dtrace/src/sbin/ddb/ddb.8#3 integrate .. //depot/projects/dtrace/src/sbin/ddb/ddb.c#3 integrate .. //depot/projects/dtrace/src/sbin/dhclient/dhclient-script#6 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/main.c#7 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifclone.c#6 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.c#10 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.h#6 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifvlan.c#5 integrate .. //depot/projects/dtrace/src/sbin/restore/dirs.c#5 integrate .. //depot/projects/dtrace/src/sbin/restore/interactive.c#4 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#32 integrate .. //depot/projects/dtrace/src/share/man/man8/rc.subr.8#10 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#30 integrate .. //depot/projects/dtrace/src/share/man/man9/lock.9#14 integrate .. //depot/projects/dtrace/src/share/man/man9/rwlock.9#10 integrate .. //depot/projects/dtrace/src/share/man/man9/sleep.9#7 integrate .. //depot/projects/dtrace/src/share/mk/sys.mk#21 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/intr_machdep.c#14 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#38 integrate .. //depot/projects/dtrace/src/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/dtrace/src/sys/arm/arm/elf_trampoline.c#12 integrate .. //depot/projects/dtrace/src/sys/arm/arm/intr.c#8 integrate .. //depot/projects/dtrace/src/sys/arm/arm/machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#22 integrate .. //depot/projects/dtrace/src/sys/arm/include/machdep.h#4 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#12 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/files.sa11x0#5 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_io.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/ep80219_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/files.ep80219#3 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/files.i80219#3 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/files.i80321#4 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/files.iq31244#4 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#13 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/obio_space.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/files.ixp425#4 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#14 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#24 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#24 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#24 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#24 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#24 integrate .. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_uid16.c#6 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_util.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/pecoff/imgact_pecoff.c#8 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_sysvec.c#6 integrate .. //depot/projects/dtrace/src/sys/conf/Makefile.arm#9 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#45 integrate .. //depot/projects/dtrace/src/sys/conf/files#81 integrate .. //depot/projects/dtrace/src/sys/conf/options#46 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac.c#16 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac_disk.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/Osd/OsdSynch.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/cxgb_support.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/de/if_de.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_80003es2lan.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_82540.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_82541.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_82542.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_82543.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_82571.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_82571.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_api.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_api.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_defines.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_hw.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_mac.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_mac.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_manage.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_nvm.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_nvm.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/dtrace/src/sys/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_phy.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/e1000_phy.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/if_em.c#19 integrate .. //depot/projects/dtrace/src/sys/dev/em/if_em.h#13 integrate .. //depot/projects/dtrace/src/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/dtrace/src/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/mii/ip1000phy.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/mii/miidevs#14 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#21 integrate .. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge.c#16 integrate .. //depot/projects/dtrace/src/sys/dev/re/if_re.c#19 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/fdescfs/fdesc_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#21 integrate .. //depot/projects/dtrace/src/sys/fs/nullfs/null_vfsops.c#11 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#14 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_vfsops.c#12 integrate .. //depot/projects/dtrace/src/sys/i386/i386/intr_machdep.c#12 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#34 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_util.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_sysvec.c#10 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/elf_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/interrupt.c#9 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#18 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#14 integrate .. //depot/projects/dtrace/src/sys/ia64/include/md_var.h#6 integrate .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#32 integrate .. //depot/projects/dtrace/src/sys/kern/kern_clock.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_conf.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_event.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#27 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/kern_jail.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#23 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lockf.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mbuf.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/kern_rwlock.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/kern_timeout.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#20 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#32 integrate .. //depot/projects/dtrace/src/sys/kern/subr_sleepqueue.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.c#31 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.master#23 integrate .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#27 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_acl.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_cache.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_extattr.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#29 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#36 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#22 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#17 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#39 integrate .. //depot/projects/dtrace/src/sys/modules/em/Makefile#7 integrate .. //depot/projects/dtrace/src/sys/modules/igb/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#19 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_car.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#20 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#14 integrate .. //depot/projects/dtrace/src/sys/netncp/ncp_conn.c#8 integrate .. //depot/projects/dtrace/src/sys/pci/if_rlreg.h#14 integrate .. //depot/projects/dtrace/src/sys/powerpc/include/asm.h#4 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/intr_machdep.c#12 integrate .. //depot/projects/dtrace/src/sys/powerpc/psim/openpic_iobus.c#7 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_syscalls.c#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/intr_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/intr_machdep.c#10 integrate .. //depot/projects/dtrace/src/sys/sys/_lockmgr.h#1 branch .. //depot/projects/dtrace/src/sys/sys/_stack.h#1 branch .. //depot/projects/dtrace/src/sys/sys/callout.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/cpuset.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/fcntl.h#11 integrate .. //depot/projects/dtrace/src/sys/sys/imgact.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/interrupt.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/lockmgr.h#19 integrate .. //depot/projects/dtrace/src/sys/sys/namei.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#47 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#40 integrate .. //depot/projects/dtrace/src/sys/sys/rwlock.h#10 integrate .. //depot/projects/dtrace/src/sys/sys/sleepqueue.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/stack.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/stat.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.h#29 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.mk#29 integrate .. //depot/projects/dtrace/src/sys/sys/syscallsubr.h#11 integrate .. //depot/projects/dtrace/src/sys/sys/sysproto.h#29 integrate .. //depot/projects/dtrace/src/sys/sys/time.h#15 integrate .. //depot/projects/dtrace/src/sys/sys/umtx.h#12 integrate .. //depot/projects/dtrace/src/sys/sys/vnode.h#15 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_snapshot.c#16 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_softdep.c#18 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vnops.c#18 integrate .. //depot/projects/dtrace/src/sys/vm/uma.h#6 integrate .. //depot/projects/dtrace/src/sys/vm/uma_core.c#9 integrate .. //depot/projects/dtrace/src/sys/vm/vm_kern.c#11 integrate .. //depot/projects/dtrace/src/sys/vm/vm_map.c#16 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#33 integrate .. //depot/projects/dtrace/src/sys/vm/vm_phys.c#4 integrate .. //depot/projects/dtrace/src/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/dtrace/src/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/dtrace/src/tools/regression/lib/msun/Makefile#9 integrate .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-csqrt.c#2 integrate .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-fma.c#1 branch .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-fma.t#1 branch .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-rem.c#5 integrate .. //depot/projects/dtrace/src/tools/tools/README#7 integrate .. //depot/projects/dtrace/src/tools/tools/mctest/Makefile#1 branch .. //depot/projects/dtrace/src/tools/tools/mctest/mctest.1#1 branch .. //depot/projects/dtrace/src/tools/tools/mctest/mctest.cc#2 integrate .. //depot/projects/dtrace/src/tools/tools/mctest/mctest.h#2 integrate .. //depot/projects/dtrace/src/usr.bin/gprof/gprof.h#5 integrate .. //depot/projects/dtrace/src/usr.bin/kdump/kdump.1#5 integrate .. //depot/projects/dtrace/src/usr.bin/kdump/kdump.c#14 integrate .. //depot/projects/dtrace/src/usr.bin/ktrace/ktrace.1#6 integrate .. //depot/projects/dtrace/src/usr.bin/ktrace/ktrace.c#6 integrate .. //depot/projects/dtrace/src/usr.bin/xlint/lint1/param.h#4 integrate .. //depot/projects/dtrace/src/usr.sbin/btxld/btxld.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/fifolog/fifolog_reader/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/Makefile#6 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/perform.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/Makefile#4 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/README#4 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/check.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/common.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/extern.h#5 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/gzip.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/gzip.h#5 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/main.c#5 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/pgp.h#5 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/pgp_check.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/pgp_sign.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/pkg_sign.1#4 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/sha1.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/sign.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/stand.c#5 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/stand.h#5 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/sign/x509.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/lockd.c#10 integrate .. //depot/projects/dtrace/src/usr.sbin/rpc.statd/statd.c#8 integrate .. //depot/projects/dtrace/www/en/developers.sgml#32 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#27 integrate .. //depot/projects/dtrace/www/en/gnome/docs/Makefile#9 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#20 integrate .. //depot/projects/dtrace/www/en/gnome/docs/halfaq.sgml#1 branch .. //depot/projects/dtrace/www/en/gnome/images/gnome.png#3 integrate .. //depot/projects/dtrace/www/en/gnome/index.xsl#11 integrate .. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#17 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode.xsl#4 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.isp.xml#9 integrate .. //depot/projects/dtrace/www/share/sgml/events.xml#24 integrate .. //depot/projects/dtrace/www/share/sgml/navibar.ent#10 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#45 integrate .. //depot/projects/dtrace/www/tools/heatmaps/heatmap.pl#1 branch Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#67 (text+ko) ==== @@ -1,4 +1,4 @@ - + + The &os; Documentation Engineering Team @@ -61,6 +61,10 @@ &a.krion; + + + &a.flz; + ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2217,12 +2217,12 @@ Now, for the hard part: making the filter. For that, we need a DVI-to-LaserJet/PCL conversion program. The FreeBSD Ports Collection (see The Ports Collection) - has one: dvi2xx is the name of the package. - Installing this package gives us the program we need, + has one: print/dvi2xx. + Installing this port gives us the program we need, dvilj2p, which converts DVI into LaserJet IIp, LaserJet III, and LaserJet 2000 compatible codes. - dvilj2p makes the filter + The dvilj2p utility makes the filter hpdf quite complex since dvilj2p cannot read from standard input. It wants to work with a filename. What is worse, the filename has to ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#63 (text+ko) ==== @@ -1,7 +1,7 @@ + 7.0-STABLE after the MFC of kdb_enter_why(). + 700102 + + + 8.0-CURRENT. Separating wide and single byte ctype. 800000 @@ -12052,6 +12057,18 @@ addition of &man.lockmgr.waiters.9;. 800029 + + 8.0-CURRENT after the introduction of the + &man.rw.try.rlock.9; and &man.rw.try.wlock.9; functions. + + 800030 + + + 8.0-CURRENT after the introduction of the + lockmgr_rw and + lockmgr_args_rw functions. + 800031 + ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/es_ES.ISO8859-1/articles/Makefile,v 1.10 2008/02/03 14:43:13 carvay Exp $ +# $FreeBSD: doc/es_ES.ISO8859-1/articles/Makefile,v 1.11 2008/03/31 16:58:38 carvay Exp $ # $FreeBSDes: doc/es_ES.ISO8859-1/articles/Makefile,v 1.3 2004/10/09 02:01:17 jesusr Exp $ SUBDIR = @@ -13,6 +13,7 @@ SUBDIR+= laptop SUBDIR+= linux-comparison SUBDIR+= mailing-list-faq +SUBDIR+= nanobsd SUBDIR+= p4-primer SUBDIR+= problem-reports SUBDIR+= releng ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/jails/chapter.sgml#2 (text+ko) ==== @@ -1,33 +1,1043 @@ - Matteo Riondato - Escrito por + Escrito por Jaulas - jaulas + jails - * + Sinopsis + + En este capítulo se explica qué son las + jaulas en &os; y cómo usarlas. Las jaulas, citadas + con frecuencia como la nueva generación de + entornos chroot, son una herramienta + muy poderosa que se ha puesto al servicio de los administradores + de sistemas, aunque su uso más básico puede + ser también de suma utilidad para usuarios avanzados. + + Tras leer este capítulo sabrá usted: + + + + Qué es una jaula y para qué puede usarse + en sistemas &os;. + + + + Cómo generar, arrancar y parar una jaula. + + + + Cómo manejarse con los rudimentos de la + administración de las jaulas, tanto desde dentro + como desde fuera de la jaula. + + + + Otras fuentes de información útil sobre + las jaulas: + + + + La página de manual &man.jail.8;. Es la referencia + completa de jail, la herramienta administrativa + de &os; con la que se arrancan, paran y controlan las jaulas. + + + + Las listas de correo y sus respectivos archivos. Los archivos + de la &a.questions;, entre otras listas de correo alojadas en + el &a.mailman.lists; contienen una enorme cantidad de + información sobre jaulas. La ayuda que está + buscando puede obtenerla, por tanto, de una búsqueda + en los archivos de las listas o de enviar una pregunta que + nadie haya hecho en la lista de correo &a.questions.name;. + + + + + + + Términos relacionados con las jaulas + + Para ayudar a comprender las partes de &os; que intervienen + en el funcionamiento de las jaulas, su funcionamiento interno y + el modo en que interactuan con el resto de &os;, durante el + resto del capítulo se utilizarán los siguientes + términos: + + + + &man.chroot.2; (comando) + + Es una llamada al sistema de &os; que restringe el + directorio raiz de un proceso y sus hijos. + + + + + &man.chroot.2; (entorno) + + Es el entorno de procesos que se ejecutan en un + chroot. Esto incluye recursos como + la parte visible del sistema de ficheros, los ID de usuario + y grupo disponibles, interfaces de red u otros mecanismos IPC, + + + + + &man.jail.8; (comando) + + La herramienta de administración que permite arrancar + procesos dentro del entorno de una jaula. + + + + + servidor (sistema, proceso, usuario, etc) + + El sistema que controla una jaula. El servidor tiene + acceso a todos los recursos de hardware y puede controlar + procesos tanto dentro como fuera de la jaula. Una de las + diferencias importantes entre el sistema que aloja la jaula y + la jaula propiamente dicha: las limitaciones que afectan a + los procesos que se ejecutan con privilegios de superusuario + dentro de la jaula no dependen de los procesos del + servidor que la aloja. + + + + + enjaulado (sistema, proceso, usuario, etc.) + + Un proceso, usuario u otra entidad, cuyo acceso a los + recursos está restringido por una jaula de &os;. + + + + + + + Introducción + + Dado lo dificil y desconcertante de la tarea de + administrar sistemas se han ido desarrollando poderosas + herramientas con el fin de hacer la vida del administrador + más sencilla. Dichas herramientas suelen facilitar + cierto tipo de mejoras en la instalación, configuración + o mantenimiento de los sistemas. Una de las tareas que + se espera que cumpla un administrador de sistemas es la + configuración adecuada de la seguridad, de modo que + pueda dar el servicio para el que se ha destinado sin que + pueda verse comprometido. + + Una de las herramientas disponibles para mejorar los niveles + de seguridad de un sistema &os; es el uso de + jaulas. Las jaulas fueron introducidas en + &os; 4.X por &a.phk;, pero en &os; 5.X sus capacidades fueron + aumentadas hasta hacer de ellas un subsistema poderoso y + flexible. Su desarrollo sigue avanzando, aumentando así su + utilidad, rendimiento, fiabilidad y seguridad. + + + Qué es una jaula + + Los sistemas tipo BSD disponen de &man.chroot.2; desde + la época de 4.2BSD. &man.chroot.8; permite restringir + el directorio raiz de un conjunto de procesos, creando un + entorno seguro y separado del resto del sistema. Los procesos + creados dentro de un entorno chroot no pueden acceder a ficheros + o recursos ubicados fuera del mismo. Por esta razón, + si un atacante logra comprometer un servicio que se ejecuta + en un entorno chroot no debería automáticamente + poder acceder al resto del sistema. &man.chroot.8; es una + buena herramienta para tareas sencillas que no requieran + mucha flexibilidad o características complejas o muy + avanzadas. Por desgracia, desde la invención de chroot + se han ido encontrando muchas formas de saltarse las + barreras que chroot impone y, aunque estén corregidas + en las versiones más modernas del kernel de &os;, + era evidente que &man.chroot.2; no era la solución + ideal para ejecutar servicios con seguridad. Había + que implementar un nuevo subsistema. + + Este es uno de los principales motivos por los que + se crearon las jaulas. + + Las jaulas llevan más allá en muchos + sentidos el concepto tradicional de entorno + &man.chroot.2;. En un entorno &man.chroot.2; tradicional los + procesos solo ven limitada la parte del sistema de ficheros + a la que pueden acceder. El resto de recursos del sistema, + es decir, el conjunto de usuarios del sistema, los procesos + en ejecución o el subsistema de red están + compartidos entre el sistema alojado y el servidor. Las jaulas + extienden este modelo virtualizando no solamente el acceso al + sistema de ficheros, sino al conjunto de usuarios, al subsistema + de red del kernel de &os; y unas cuantas cosas más. En la se detallan diversas opciones de + control exhaustivo para configurar el acceso a recursos de + un entorno enjaulado. + + Una jaula se caracteriza por disponer de cuatro elementos: + + + + Un subárbol de directorios: + el punto desde el que se entra a una jaula. Una vez + dentro de la jaula un proceso no puede escapar de dicho + subárbol. Los típicos problemas + de seguridad que aparecín una y otra vez en el + diseño del &man.chroot.2; original no afectan a + las jaulas de &os;. + + + + Un nombre de máquina (hostname), + que definirá a la jaula. Las jaulas se usan + principalmente para albergar servicios de red, por lo que + disponer de un nombre de máquina descriptivo ayuda + enormemente al administrador de sistemas. + + + + Una dirección IP: debe asignarse + a la jaula y no cambiarse durante el ciclo de vida de la + jaula. La dirección IP de una jaula suele ser un + alias de un interfaz de red, aunque no es imprescindible que + así sea. + + + + Un comando: La ruta de un ejecutable ubicado dentro de + la jaula. La ruta es relativa al directorio raiz de la + jaula, por lo que puede ser muy diferentes según + el entorno. + + + + Además, las jaulas pueden tener sus propios usuarios + e incluso su propio root. Es obvio que + este usuario root tiene su poder para hacer + circunscrito a la jaula y, desde el punto de vista del servidor, + el usuario root de la jaula no es + omnipotente. El usuario root de la jaula + no puede ejecutar tareas críticas fuera de la jaula + (&man.jail.8;) a la que pertenece. Más adelante, en + la , se dará más + información sobre las restricciones del usuario + root. + + + + + Creación y gestión de jaulas + + Algunos administradores dividen las jaulas en dos tipos: + jaulas completas, que recrean un sistema &os; + real, y jaulas de servicio, que son aquellas + que están dedicadas a una sola aplicación o + servicio, en muchos casos ejecutándose sin privilegios. Se + trata de una división exclusivamente conceptual, por lo + que el proceso de generación de una jaula no se ve + afectado por ella. La página de manual &man.jail.8; + explica claramente el procedimiento a seguir para generar una + jaula: + + &prompt.root; setenv D /aquí/está/la/jaula +&prompt.root; mkdir -p $D +&prompt.root; cd /usr/src +&prompt.root; make world DESTDIR=$D +&prompt.root; cd etc/ Este paso +no es necesario en &os; 6.0 y versiones posteriores. +&prompt.root; make distribution DESTDIR=$D +&prompt.root; mount_devfs devfs $D/dev + + + + El mejor punto de partida es la elección del punto + del sistema de ficheros del servidor donde estará + físicamente ubicada la jaula. /usr/jail/nombredelajaula + es un buen sitio. nombredelajaula + es el nombre de máquina que identifica a la jaula. El + sistema de ficheros /usr/ suele tener espacio + suficiente para albergar el sistema de ficheros de la jaula que, + cuando se trata de jaulas completas, es + esencialmente lo necesario para alojar todos y cada uno de + los sistemas de ficheros en una instalación del sistema + base por omisión de &os;. + + + + Este comando creará el contenido necesario + (binarios, bibliotecas, páginas de manual, etc.) y + lo copiará al subárbol elegido + como ubicación física de la jaula. Todo se + hace al típico estilo &os;: se compila todo y luego + se instala en la ruta de destino. + + + + Al pasar el target + distribution a + make se instalan todos los ficheros + de configuración necesarios. En pocas palabras, + instala cada fichero instalable que haya en + /usr/src/etc/ en el + directorio /etc de la + jaula, es decir, en + $D/etc/. + + + + No es imprescindible montar el sistema de ficheros + &man.devfs.8; dentro de la jaula aunque por otra parte + (casi) todas las aplicaciones necesitan acceso al menos + a un dispositivo, dependiendo esto del propósito + de la aplicación. Es muy importante el control del + acceso a dispositivos desde la jaula, puesto que una + configuración descuidada puede permitir que un + atacante haga de las suyas. El control sobre &man.devfs.8; + se gestiona mediante reglas que se detallan en las + páginas de manual &man.devfs.8; y &man.devfs.conf.5;. + + + + Una vez instalada la jaula puede arrancarla mediante + &man.jail.8;. &man.jail.8; usa los cuatro argumentos que + se detallan en la . Puede pasarle otros argumentos + además de estos, por ejemplo para ejecutar procesos + enjaulados bajo los permisos de un usuario específico. El + argumento + depende del tipo de jaula; si se trata de un + virtual system /etc/rc + es una buena elección, puesto que ejecutará la + secuencia de arranque de un sistema &os; real. Si se trata + de una jaula de servicio depende del + servicio o aplicación que se quiera ejecutar mediante + la jaula. + + Con frecuencia las jaulas se arrancan durante el arranque del + servidor que las aloja; el sistema rc de + &os; permite hacerlo de un modo muy sencillo. + + + + Puede crear una lista de jaulas que quiera arrancar + en el inicio del sistema en el fichero + &man.rc.conf.5;: + + jail_enable="YES" # Ponga NO si quiere desactivar el arranque de jaulas +jail_list="www" # Lista de nombres de jaulas separados por espacios + + + + Tendrá que añadir parámetros + específicos para cada jaula al fichero + &man.rc.conf.5;: + + jail_www_rootdir="/usr/jail/www" # directorio raiz de la jaula +jail_www_hostname="www.example.org" # nombre de máquina de la jaula +jail_www_ip="192.168.0.10" # dirección IP de la jaula +jail_www_devfs_enable="YES" # montar devfs en la jaula +jail_www_devfs_ruleset="www_ruleset" # reglas a aplicar a devfs dentro de la jaula + + El arranque de jaulas por omisión que se + configure en &man.rc.conf.5; ejecutará el script + /etc/rc de la jaula y asumirá + que es un sistema virtual completo. Si se trata de una + jaula de servicio el comando de arranque por omisión + tendrá que cambiarse configurando la opción + jail_nombredejaula_exec_start + según convenga. + + + Si quiere consultar la lista completa de opciones + consulte la página de manual + &man.rc.conf.5;. + + + + Puede arrancar o parar a mano una jaula mediante el script + /etc/rc.d/jail siempre y cuando la jaula + aparezca en rc.conf: + + &prompt.root; /etc/rc.d/jail start www +&prompt.root; /etc/rc.d/jail stop www + + De momento no hay una forma limpia de apagar una jaula + (&man.jail.8;) debido a que los comandos que se usan normalmente + para producir un apagado limpio del sistema no pueden usarse + dentro de una jaula. La mejor forma de parar una jaula es + ejecutar el siguiente comando desde dentro de la propia jaula + o bien mediante &man.jexec.8; desde fuera: + + &prompt.root; sh /etc/rc.shutdown + + Para más información consulte la página + de manual &man.jail.8;. + + + + Administración y personalización a fondo + + Hay diversas opciones que pueden usarse en las jaulas y varios + tipos de formas de combinar un sistema &os; servidor y las jaulas + y poder disponer de aplicaciones de alto nivel. En esta + sección se muestra lo siguiente: + + + + Algunas de las opciones disponibles para personalizar + el comportamiento y las restricciones de seguridad que + pueden aplicarse en una jaula. + + + + Algunas de las aplicaciones de alto nivel creadas para + la administración de jaulas. Estas aplicaciones + están en la colección de ports y pueden + utilizarse en conjunto para implementar productos + basados en jaulas. + + + + Herramientas del sistema para la personalización + de jaulas en &os; + + La personalización a fondo de las jaulas se hace + en su mayor parte mediante la configuración de variables + &man.sysctl.8;. Hay una subcategoría especial de + sysctl para que sea más sencillo organizar las opciones + más más importantes: se trata de las opciones + de la jerarquía security.jail.* + del kernel de &os;. A continuación veremos una lista + de las principales sysctl relacionadas con las jaulas y los + valores que tienen por omisión. Los nombres deberían + describir por sí mismos qué función tienen + (N. del T.: En inglés, claro) pero si necesita más + información sobre ellas consulte las páginas de + manual &man.jail.8; y &man.sysctl.8;. + + + + security.jail.set_hostname_allowed: + 1 + + + + security.jail.socket_unixiproute_only: + 1 + + + + security.jail.sysvipc_allowed: + 0 + + + + security.jail.enforce_statfs: + 2 + + + + security.jail.allow_raw_sockets: + 0 + + + + security.jail.chflags_allowed: + 0 + + + + security.jail.jailed: 0 + + + + El administrador del servidor puede + usar estas variables para añadir o quitar limitaciones + impuestas por omisión al usuario + root. Tenga en cuenta que hay ciertas + limitaciones que no pueden quitarse. El usuario + root no puede montar o desmontar sistemas + de ficheros desde su jaula. El usuario root + no puede cargar o descargar reglas de &man.devfs.8;, configurar + reglas de cortafuegos ni ejecutar muchas otras tareas + administrativas que requieran modificaciones o acceso a datos + internos del kernel, como cambiar el nivel de seguridad + securelevel del kernel. + + El sistema base de &os; contiene un conjunto básico + de herramientas que permiten el acceso a información + sobre jaulas activas en el sistema, así como la + conexión a una jaula para ejecutar comandos + administrativos. &man.jls.8; y &man.jexec.8; forman parte + del sistema base de &os; y permiten ejecutar las siguientes + tareas: + + + + Mostrar una lista de jaulas activas y sus correspondientes + identificadores de jaula (JID), >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 6 23:30:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 203B41065677; Sun, 6 Apr 2008 23:30:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6E281065671 for ; Sun, 6 Apr 2008 23:30:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C33F28FC0C for ; Sun, 6 Apr 2008 23:30:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m36NUbYT034143 for ; Sun, 6 Apr 2008 23:30:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m36NUbIO034141 for perforce@freebsd.org; Sun, 6 Apr 2008 23:30:37 GMT (envelope-from sam@freebsd.org) Date: Sun, 6 Apr 2008 23:30:37 GMT Message-Id: <200804062330.m36NUbIO034141@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 Cc: Subject: PERFORCE change 139484 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2008 23:30:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=139484 Change 139484 by sam@sam_ebb on 2008/04/06 23:29:52 Handle beacon miss: we cannot use the 802.11 layer to do the right thing; instead we need to tell the firmware to disassociate so we clear state and on completion we then kick the state machine. Affected files ... .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#20 edit .. //depot/projects/vap/sys/dev/iwi/if_iwivar.h#13 edit Differences ... ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#20 (text+ko) ==== @@ -157,7 +157,6 @@ static uint16_t iwi_read_prom_word(struct iwi_softc *, uint8_t); static void iwi_frame_intr(struct iwi_softc *, struct iwi_rx_data *, int, struct iwi_frame *); -static void iwi_bmiss(void *, int); static void iwi_authsuccess(void *, int); static void iwi_assocsuccess(void *, int); static void iwi_assocfailed(void *, int); @@ -371,8 +370,6 @@ iwi_wme_init(sc); - TASK_INIT(&sc->sc_bmiss_task, 0, iwi_bmiss, ic); - ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; @@ -1392,14 +1389,7 @@ /* * Task queue callbacks for iwi_notification_intr used to avoid LOR's. */ -static void -iwi_bmiss(void *arg, int npending) -{ - struct ieee80211com *ic = arg; - ieee80211_beacon_miss(ic); -} - static void iwi_authsuccess(void *arg, int npending) { @@ -1519,6 +1509,7 @@ &IWI_VAP(vap)->iwi_assocsuccess_task); break; case IWI_ASSOC_INIT: + sc->flags &= ~IWI_FLAG_ASSOCIATED; switch (sc->fw_state) { case IWI_FW_ASSOCIATING: DPRINTFN(2, ("Association failed\n")); @@ -1530,10 +1521,10 @@ case IWI_FW_DISASSOCIATING: DPRINTFN(2, ("Dissassociated\n")); IWI_STATE_END(sc, IWI_FW_DISASSOCIATING); - /* XXX what next? */ + taskqueue_enqueue(taskqueue_swi, + &IWI_VAP(vap)->iwi_assocfailed_task); break; } - sc->flags &= ~IWI_FLAG_ASSOCIATED; break; default: device_printf(sc->sc_dev, @@ -1561,8 +1552,15 @@ DPRINTF(("Beacon miss: %u >= %u\n", le32toh(beacon->number), vap->iv_bmissthreshold)); - taskqueue_enqueue(taskqueue_swi, - &sc->sc_bmiss_task); + /* + * It's pointless to notify the 802.11 layer + * as it'll try to send a probe request (which + * we'll discard) and then timeout and drop us + * into scan state. Instead tell the firmware + * to disassociate and then on completion we'll + * kick the state machine to scan. + */ + iwi_queue_cmd(sc, IWI_DISASSOC, 1); } } break; ==== //depot/projects/vap/sys/dev/iwi/if_iwivar.h#13 (text+ko) ==== @@ -198,7 +198,6 @@ struct task sc_scanaborttask; /* cancel active scan */ struct task sc_restarttask; /* restart adapter processing */ struct task sc_opstask; /* scan / auth processing */ - struct task sc_bmiss_task; /* beacon miss processing */ unsigned int sc_softled : 1, /* enable LED gpio status */ sc_ledstate: 1, /* LED on/off state */ From owner-p4-projects@FreeBSD.ORG Mon Apr 7 00:56:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C7D11065675; Mon, 7 Apr 2008 00:56:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C20C1065673 for ; Mon, 7 Apr 2008 00:56:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C3E28FC1D for ; Mon, 7 Apr 2008 00:56:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m370uCYX047762 for ; Mon, 7 Apr 2008 00:56:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m370u94R047760 for perforce@freebsd.org; Mon, 7 Apr 2008 00:56:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 7 Apr 2008 00:56:09 GMT Message-Id: <200804070056.m370u94R047760@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 139486 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 00:56:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=139486 Change 139486 by rwatson@rwatson_fledge on 2008/04/07 00:55:22 Integrate zcopybpf. Affected files ... .. //depot/projects/zcopybpf/src/sys/amd64/amd64/intr_machdep.c#9 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#16 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/prof_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#11 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/clock.h#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/isa/clock.c#8 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/intr.c#6 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/kb920x_machdep.c#8 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/AVILA#9 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/BWCT#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/CRB#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/EP80219#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/KB920X#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/SKYEYE#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/machdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/param.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/files.sa11x0#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/cdboot/cdboot.s#4 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/cdboot/cdboot.s#4 integrate .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/zcopybpf/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/zcopybpf/src/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_file.c#7 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_uid16.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#4 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#6 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_misc.c#3 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_string.c#3 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#7 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/rpc/xdr.h#3 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/atomic.h#3 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kcondvar.h#3 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kmem.h#5 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kobj.h#3 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/misc.h#3 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/mutex.h#5 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/proc.h#5 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/rwlock.h#5 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/stat.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/string.h#3 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/time.h#3 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/types.h#4 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/vfs.h#3 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/vnode.h#5 delete .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/zcopybpf/src/sys/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/zcopybpf/src/sys/compat/svr4/svr4_fcntl.c#6 integrate .. //depot/projects/zcopybpf/src/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.arm#6 integrate .. //depot/projects/zcopybpf/src/sys/conf/NOTES#19 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#23 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#18 integrate .. //depot/projects/zcopybpf/src/sys/conf/options.amd64#4 integrate .. //depot/projects/zcopybpf/src/sys/conf/options.i386#4 integrate .. //depot/projects/zcopybpf/src/sys/conf/options.pc98#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/avl/avl.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#5 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#8 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#4 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#4 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#4 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#10 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#9 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#5 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/os/callb.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/os/taskq.c#4 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/procset.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_command.c#4 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_ps.c#4 integrate .. //depot/projects/zcopybpf/src/sys/ddb/ddb.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aacvar.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_adapter.h#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/de/if_de.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_80003es2lan.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82540.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82541.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82542.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82543.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82571.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82571.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_api.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_api.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_defines.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_hw.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_ich8lan.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_ich8lan.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_mac.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_mac.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_manage.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_nvm.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_nvm.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_osdep.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_phy.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_phy.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/if_em.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/if_em.h#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/en/midway.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/if_fwip.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/isc_soc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/malo/if_malo.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/malo/if_malo.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/malo/if_malo_pci.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/malo/if_malohal.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/malo/if_malohal.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/malo/if_maloioctl.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/miidevs#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge.c#13 integrate .. //depot/projects/zcopybpf/src/sys/dev/re/if_re.c#13 integrate .. //depot/projects/zcopybpf/src/sys/dev/speaker/spkr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/ti/if_ti.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ubsa.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_vfsops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate .. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_subr.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_vfsops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_subr.c#4 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part.h#7 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_pc98.c#1 branch .. //depot/projects/zcopybpf/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#8 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC#13 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/NOTES#11 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/XBOX#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/intr_machdep.c#9 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/pmap.c#15 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/trap.c#8 integrate .. //depot/projects/zcopybpf/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/clock.h#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/param.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/pmap.h#7 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/timerreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/vmparam.h#8 integrate .. //depot/projects/zcopybpf/src/sys/i386/isa/clock.c#8 integrate .. //depot/projects/zcopybpf/src/sys/i386/isa/prof_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/zcopybpf/src/sys/ia64/conf/GENERIC#9 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/interrupt.c#7 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/machdep.c#11 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/pmap.c#9 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/clock.h#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/md_var.h#4 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/param.h#2 integrate .. //depot/projects/zcopybpf/src/sys/isa/syscons_isa.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/init_sysent.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_clock.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_descrip.c#14 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_event.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exec.c#12 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_intr.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_jail.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_lock.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_lockf.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/makesyscalls.sh#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#19 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_mchain.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_sleepqueue.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/syscalls.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/syscalls.master#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/systrace_args.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_cons.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_acl.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_extattr.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#16 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/vnode_if.src#6 integrate .. //depot/projects/zcopybpf/src/sys/modules/Makefile#14 integrate .. //depot/projects/zcopybpf/src/sys/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/em/Makefile#4 integrate .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_part/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/igb/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/ixgbe/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/krpc/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/malo/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/sound/driver/emu10kx/Makefile#4 integrate .. //depot/projects/zcopybpf/src/sys/modules/uslcom/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/wpi/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/zfs/Makefile#7 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf.c#53 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf_buffer.c#8 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#38 integrate .. //depot/projects/zcopybpf/src/sys/net/if.c#11 integrate .. //depot/projects/zcopybpf/src/sys/net/if.h#5 integrate .. //depot/projects/zcopybpf/src/sys/net/if_ef.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_media.h#4 integrate .. //depot/projects/zcopybpf/src/sys/net/if_sl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/if_var.h#7 integrate .. //depot/projects/zcopybpf/src/sys/net/raw_cb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netatalk/aarp.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netatm/port.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_car.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_pptpgre.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_output.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_pcb.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netncp/ncp_conn.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netncp/ncp_sock.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netsmb/smb_iod.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netsmb/smb_trantcp.c#4 integrate .. //depot/projects/zcopybpf/src/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/zcopybpf/src/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/krpc_subr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_lock.c#3 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_socket.c#9 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_subs.c#8 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_serv.c#9 integrate .. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_srvcache.c#3 integrate .. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_srvsubs.c#6 integrate .. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_syscalls.c#6 integrate .. //depot/projects/zcopybpf/src/sys/nlm/nlm.h#1 branch .. //depot/projects/zcopybpf/src/sys/nlm/nlm_prot.h#1 branch .. //depot/projects/zcopybpf/src/sys/nlm/nlm_prot_clnt.c#1 branch .. //depot/projects/zcopybpf/src/sys/nlm/nlm_prot_impl.c#1 branch .. //depot/projects/zcopybpf/src/sys/nlm/nlm_prot_server.c#1 branch .. //depot/projects/zcopybpf/src/sys/nlm/nlm_prot_svc.c#1 branch .. //depot/projects/zcopybpf/src/sys/nlm/nlm_prot_xdr.c#1 branch .. //depot/projects/zcopybpf/src/sys/nlm/sm_inter.h#1 branch .. //depot/projects/zcopybpf/src/sys/nlm/sm_inter_xdr.c#1 branch .. //depot/projects/zcopybpf/src/sys/pc98/cbus/clock.c#6 integrate .. //depot/projects/zcopybpf/src/sys/pc98/cbus/syscons_cbus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/pc98/conf/GENERIC#11 integrate .. //depot/projects/zcopybpf/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/zcopybpf/src/sys/pc98/include/clock.h#2 integrate .. //depot/projects/zcopybpf/src/sys/pc98/include/timerreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_mn.c#3 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_rlreg.h#9 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/conf/GENERIC#11 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/asm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/clock.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/param.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/intr_machdep.c#9 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/psim/openpic_iobus.c#4 integrate .. //depot/projects/zcopybpf/src/sys/rpc/auth.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/auth_none.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/auth_unix.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/authunix_prot.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/clnt.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/clnt_dg.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/clnt_rc.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/clnt_stat.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/clnt_vc.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/getnetconfig.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/inet_ntop.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/inet_pton.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/netconfig.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/nettype.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/pmap_prot.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/rpc.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/rpc_callmsg.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/rpc_com.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/rpc_generic.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/rpc_msg.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/rpc_prot.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/rpcb_clnt.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/rpcb_clnt.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/rpcb_prot.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/rpcb_prot.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/rpcclnt.c#5 integrate .. //depot/projects/zcopybpf/src/sys/rpc/svc.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/svc.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/svc_auth.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/svc_auth.h#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/svc_auth_unix.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/svc_dg.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/svc_generic.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/svc_vc.c#1 branch .. //depot/projects/zcopybpf/src/sys/rpc/types.h#2 integrate .. //depot/projects/zcopybpf/src/sys/rpc/xdr.h#1 branch .. //depot/projects/zcopybpf/src/sys/security/mac/mac_syscalls.c#6 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/conf/GENERIC#10 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/param.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/intr_machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/conf/GENERIC#7 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/include/clock.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/include/cpu.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/include/param.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/intr_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/_lockmgr.h#1 branch .. //depot/projects/zcopybpf/src/sys/sys/_stack.h#1 branch .. //depot/projects/zcopybpf/src/sys/sys/aac_ioctl.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/buf.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/callout.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/cdefs.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/cpuset.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/fcntl.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/imgact.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/interrupt.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/lockf.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/lockmgr.h#8 integrate .. //depot/projects/zcopybpf/src/sys/sys/mbuf.h#12 integrate .. //depot/projects/zcopybpf/src/sys/sys/mman.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/namei.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/param.h#17 integrate .. //depot/projects/zcopybpf/src/sys/sys/proc.h#15 integrate .. //depot/projects/zcopybpf/src/sys/sys/rwlock.h#9 integrate .. //depot/projects/zcopybpf/src/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/stack.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/stat.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/syscall.h#8 integrate .. //depot/projects/zcopybpf/src/sys/sys/syscall.mk#8 integrate .. //depot/projects/zcopybpf/src/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/sysproto.h#8 integrate .. //depot/projects/zcopybpf/src/sys/sys/systm.h#9 integrate .. //depot/projects/zcopybpf/src/sys/sys/taskqueue.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/time.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/umtx.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/vnode.h#9 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_snapshot.c#9 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_vnops.c#12 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/zcopybpf/src/sys/vm/uma.h#4 integrate .. //depot/projects/zcopybpf/src/sys/vm/uma_core.c#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_kern.c#7 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_map.c#11 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_object.c#11 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_page.c#13 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_phys.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/zcopybpf/src/sys/xdr/xdr.c#1 branch .. //depot/projects/zcopybpf/src/sys/xdr/xdr_array.c#1 branch .. //depot/projects/zcopybpf/src/sys/xdr/xdr_mbuf.c#1 branch .. //depot/projects/zcopybpf/src/sys/xdr/xdr_mem.c#1 branch .. //depot/projects/zcopybpf/src/sys/xdr/xdr_reference.c#1 branch .. //depot/projects/zcopybpf/src/sys/xdr/xdr_sizeof.c#1 branch Differences ... ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/intr_machdep.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.39 2008/03/17 22:42:00 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.40 2008/04/05 19:58:28 jhb Exp $ */ /* @@ -85,9 +85,6 @@ static int intr_assign_cpu(void *arg, u_char cpu); static void intr_disable_src(void *arg); -#ifdef INTR_FILTER -static void intr_event_stray(void *cookie); -#endif static void intr_init(void *__dummy); static int intr_pic_registered(struct pic *pic); static void intrcnt_setname(const char *name, int index); @@ -238,12 +235,11 @@ isrc->is_pic->pic_disable_source(isrc, PIC_EOI); } -#ifdef INTR_FILTER void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { + struct intr_event *ie; struct thread *td; - struct intr_event *ie; int vector; td = curthread; @@ -267,64 +263,11 @@ if (vector == 0) clkintr_pending = 1; - if (intr_event_handle(ie, frame) != 0) - intr_event_stray(isrc); -} - -static void -intr_event_stray(void *cookie) -{ - struct intsrc *isrc; - - isrc = cookie; /* * For stray interrupts, mask and EOI the source, bump the * stray count, and log the condition. */ - isrc->is_pic->pic_disable_source(isrc, PIC_EOI); - (*isrc->is_straycount)++; - if (*isrc->is_straycount < MAX_STRAY_LOG) - log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc)); - else if (*isrc->is_straycount == MAX_STRAY_LOG) - log(LOG_CRIT, - "too many stray irq %d's: not logging anymore\n", - isrc->is_pic->pic_vector(isrc)); -} -#else -void -intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) -{ - struct thread *td; - struct intr_event *ie; - struct intr_handler *ih; - int error, vector, thread, ret; - - td = curthread; - - /* - * We count software interrupts when we process them. The - * code here follows previous practice, but there's an - * argument for counting hardware interrupts when they're - * processed too. - */ - (*isrc->is_count)++; - PCPU_INC(cnt.v_intr); - - ie = isrc->is_event; - - /* - * XXX: We assume that IRQ 0 is only used for the ISA timer - * device (clk). - */ - vector = isrc->is_pic->pic_vector(isrc); - if (vector == 0) - clkintr_pending = 1; - - /* - * For stray interrupts, mask and EOI the source, bump the - * stray count, and log the condition. - */ - if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) { + if (intr_event_handle(ie, frame) != 0) { isrc->is_pic->pic_disable_source(isrc, PIC_EOI); (*isrc->is_straycount)++; if (*isrc->is_straycount < MAX_STRAY_LOG) @@ -333,60 +276,8 @@ log(LOG_CRIT, "too many stray irq %d's: not logging anymore\n", vector); - return; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 7 02:06:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A3B8106567B; Mon, 7 Apr 2008 02:06:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 34005106566B for ; Mon, 7 Apr 2008 02:06:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D72C8FC16 for ; Mon, 7 Apr 2008 02:06:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3726Q8u053514 for ; Mon, 7 Apr 2008 02:06:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3726Qjv053512 for perforce@freebsd.org; Mon, 7 Apr 2008 02:06:26 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Apr 2008 02:06:26 GMT Message-Id: <200804070206.m3726Qjv053512@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 Cc: Subject: PERFORCE change 139489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 02:06:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=139489 Change 139489 by sam@sam_ebb on 2008/04/07 02:05:30 Split rfkill polling into it's own callout that's run only when the rfkill switch is set to the off position; we have to unblock the taskq to get this to work which is a bit worrisome Note we don't always reset state properly on radio on because ieee80211_start_all isn't able to clock the state machine when the vaps are set in manual roaming mode (e.g. by wpa_supplicant). We need to add events to mark radio on/off so user apps can rebuild state. Affected files ... .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#21 edit .. //depot/projects/vap/sys/dev/iwi/if_iwivar.h#14 edit Differences ... ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#21 (text+ko) ==== @@ -308,6 +308,7 @@ TASK_INIT(&sc->sc_opstask, 0, iwi_ops, sc); TASK_INIT(&sc->sc_scanaborttask, 0, iwi_scanabort, sc); callout_init_mtx(&sc->sc_wdtimer, &sc->sc_mtx, 0); + callout_init_mtx(&sc->sc_rftimer, &sc->sc_mtx, 0); if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { device_printf(dev, "chip is in D%d power mode " @@ -2022,19 +2023,6 @@ taskqueue_enqueue(sc->sc_tq2, &sc->sc_restarttask); } } - if (sc->sc_rfkill_timer > 0) { - if (--sc->sc_rfkill_timer == 0) { - /* - * Check for a change in rfkill state. We get an - * interrupt when a radio is disabled but not when - * it is enabled so we must poll for the latter. - */ - if (!iwi_getrfkill(sc)) - taskqueue_enqueue(sc->sc_tq, &sc->sc_radiontask); - else - sc->sc_rfkill_timer = 2; - } - } if (sc->sc_state_timer > 0) { if (--sc->sc_state_timer == 0) { if_printf(ifp, "firmware stuck in state %d, resetting\n", @@ -2053,9 +2041,7 @@ taskqueue_enqueue(sc->sc_tq2, &sc->sc_restarttask); } } - - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - callout_reset(&sc->sc_wdtimer, hz, iwi_watchdog, sc); + callout_reset(&sc->sc_wdtimer, hz, iwi_watchdog, sc); } static int @@ -2074,14 +2060,6 @@ } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) iwi_stop(sc); - else { - /* - * If device was stopped due to rfkill then - * marked down we'll have the polling thread - * running; stop it explicitly. - */ - sc->sc_rfkill_timer = 0; - } } break; case SIOCGIFMEDIA: @@ -3202,6 +3180,7 @@ sc->sc_blinking = 0; } callout_stop(&sc->sc_wdtimer); + callout_stop(&sc->sc_rftimer); iwi_stop_master(sc); @@ -3217,7 +3196,6 @@ memset(sc->sc_cmd, 0, sizeof(sc->sc_cmd)); sc->sc_tx_timer = 0; - sc->sc_rfkill_timer = 0; sc->sc_state_timer = 0; sc->sc_busy_timer = 0; sc->flags &= ~(IWI_FLAG_BUSY | IWI_FLAG_ASSOCIATED); @@ -3266,6 +3244,26 @@ } static void +iwi_rfkill_poll(void *arg) +{ + struct iwi_softc *sc = arg; + + IWI_LOCK_ASSERT(sc); + + /* + * Check for a change in rfkill state. We get an + * interrupt when a radio is disabled but not when + * it is enabled so we must poll for the latter. + */ + if (!iwi_getrfkill(sc)) { + taskqueue_unblock(sc->sc_tq); + taskqueue_enqueue(sc->sc_tq, &sc->sc_radiontask); + return; + } + callout_reset(&sc->sc_rftimer, 2*hz, iwi_rfkill_poll, sc); +} + +static void iwi_radio_off(void *arg, int pending) { struct iwi_softc *sc = arg; @@ -3275,7 +3273,7 @@ IWI_LOCK(sc); iwi_stop_locked(sc); - sc->sc_rfkill_timer = 2; + iwi_rfkill_poll(sc); IWI_UNLOCK(sc); } ==== //depot/projects/vap/sys/dev/iwi/if_iwivar.h#14 (text+ko) ==== @@ -213,9 +213,9 @@ u_int16_t sc_ledoff; /* off time for current blink */ struct callout sc_ledtimer; /* led off timer */ struct callout sc_wdtimer; /* watchdog timer */ + struct callout sc_rftimer; /* rfkill timer */ int sc_tx_timer; - int sc_rfkill_timer;/* poll for rfkill change */ int sc_state_timer; /* firmware state timer */ int sc_busy_timer; /* firmware cmd timer */ From owner-p4-projects@FreeBSD.ORG Mon Apr 7 02:35:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 888381065677; Mon, 7 Apr 2008 02:35:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4AA851065674 for ; Mon, 7 Apr 2008 02:35:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4648B8FC18 for ; Mon, 7 Apr 2008 02:35:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m372ZvKe055046 for ; Mon, 7 Apr 2008 02:35:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m372ZvZt055044 for perforce@freebsd.org; Mon, 7 Apr 2008 02:35:57 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Apr 2008 02:35:57 GMT Message-Id: <200804070235.m372ZvZt055044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 139490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 02:35:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=139490 Change 139490 by jb@jb_freebsd1 on 2008/04/07 02:35:21 Fix a merge problem. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 (text+ko) ==== @@ -119,8 +119,8 @@ ASSERT(error == 0); zp->z_vnode = vp; vp->v_data = (caddr_t)zp; - vp->v_vnlock->lk_flags |= LK_CANRECURSE; - vp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_AREC(vp); + VN_LOCK_ASHARE(vp); } else { zp->z_vnode = NULL; } @@ -604,8 +604,8 @@ ASSERT(err == 0); vp = ZTOV(zp); vp->v_data = (caddr_t)zp; - vp->v_vnlock->lk_flags |= LK_CANRECURSE; - vp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_AREC(vp); + VN_LOCK_ASHARE(vp); vp->v_type = IFTOVT((mode_t)zp->z_phys->zp_mode); if (vp->v_type == VDIR) zp->z_zn_prefetch = B_TRUE; /* z_prefetch default is enabled */ From owner-p4-projects@FreeBSD.ORG Mon Apr 7 15:41:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1536B1065678; Mon, 7 Apr 2008 15:41:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA8871065674 for ; Mon, 7 Apr 2008 15:41:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB7718FC34 for ; Mon, 7 Apr 2008 15:41:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m37FftkE051049 for ; Mon, 7 Apr 2008 15:41:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m37FftZl051046 for perforce@freebsd.org; Mon, 7 Apr 2008 15:41:55 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Apr 2008 15:41:55 GMT Message-Id: <200804071541.m37FftZl051046@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 Cc: Subject: PERFORCE change 139519 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 15:41:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=139519 Change 139519 by sam@sam_ebb on 2008/04/07 15:41:28 gc beacon lock; it was replaced by the com lock long ago Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#22 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#22 (text+ko) ==== @@ -42,18 +42,6 @@ mtx_assert(&(_ic)->ic_comlock, MA_OWNED) /* - * Beacon locking definitions. - */ -typedef struct mtx ieee80211_beacon_lock_t; -#define IEEE80211_BEACON_LOCK_INIT(_ic, _name) \ - mtx_init(&(_ic)->ic_beaconlock, _name, "802.11 beacon lock", MTX_DEF) -#define IEEE80211_BEACON_LOCK_DESTROY(_ic) mtx_destroy(&(_ic)->ic_beaconlock) -#define IEEE80211_BEACON_LOCK(_ic) mtx_lock(&(_ic)->ic_beaconlock) -#define IEEE80211_BEACON_UNLOCK(_ic) mtx_unlock(&(_ic)->ic_beaconlock) -#define IEEE80211_BEACON_LOCK_ASSERT(_ic) \ - mtx_assert(&(_ic)->ic_beaconlock, MA_OWNED) - -/* * Node locking definitions. */ typedef struct mtx ieee80211_node_lock_t; From owner-p4-projects@FreeBSD.ORG Mon Apr 7 16:39:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C23281065672; Mon, 7 Apr 2008 16:39:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B0C1106566B for ; Mon, 7 Apr 2008 16:39:06 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B0868FC17 for ; Mon, 7 Apr 2008 16:39:06 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m37Gd6N2055632 for ; Mon, 7 Apr 2008 16:39:06 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m37Gd5FT055630 for perforce@freebsd.org; Mon, 7 Apr 2008 16:39:05 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Apr 2008 16:39:05 GMT Message-Id: <200804071639.m37Gd5FT055630@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 Cc: Subject: PERFORCE change 139523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 16:39:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=139523 Change 139523 by sam@sam_ebb on 2008/04/07 16:38:42 switch the node table lock from a mtx to a rwlock; this allows us to eliminate the scan lock and will permit conversion of some fast path operations to a shared lock acquisition; in the process rename "SCAN_LOCK" to "NODE_ITERATE_LOCK" to make it more clear we're sharing the same lock Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#23 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.c#28 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#18 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#23 (text+ko) ==== @@ -28,6 +28,11 @@ #define _NET80211_IEEE80211_FREEBSD_H_ #ifdef _KERNEL +#include +#include +#include +#include + /* * Common state locking definitions. */ @@ -44,28 +49,22 @@ /* * Node locking definitions. */ -typedef struct mtx ieee80211_node_lock_t; +typedef struct rwlock ieee80211_node_lock_t; #define IEEE80211_NODE_LOCK_INIT(_nt, _name) \ - mtx_init(&(_nt)->nt_nodelock, _name, "802.11 node table", \ - MTX_DEF | MTX_RECURSE) -#define IEEE80211_NODE_LOCK_DESTROY(_nt) mtx_destroy(&(_nt)->nt_nodelock) -#define IEEE80211_NODE_LOCK(_nt) mtx_lock(&(_nt)->nt_nodelock) -#define IEEE80211_NODE_IS_LOCKED(_nt) mtx_owned(&(_nt)->nt_nodelock) -#define IEEE80211_NODE_UNLOCK(_nt) mtx_unlock(&(_nt)->nt_nodelock) -#define IEEE80211_NODE_LOCK_ASSERT(_nt) \ - mtx_assert(&(_nt)->nt_nodelock, MA_OWNED) + rw_init_flags(&(_nt)->nt_nodelock, _name, RW_RECURSE) +#define IEEE80211_NODE_LOCK_DESTROY(_nt) rw_destroy(&(_nt)->nt_nodelock) +#define IEEE80211_NODE_LOCK(_nt) rw_wlock(&(_nt)->nt_nodelock) +#define IEEE80211_NODE_IS_LOCKED(_nt) rw_wowned(&(_nt)->nt_nodelock) +#define IEEE80211_NODE_UNLOCK(_nt) rw_wunlock(&(_nt)->nt_nodelock) +#define IEEE80211_NODE_LOCK_ASSERT(_nt) \ + rw_assert(&(_nt)->nt_nodelock, RA_WLOCKED) /* - * Node table scangen locking definitions. + * Node table iteration locking definitions; we piggyback on the node + * table lock by using a read/shared acquisition. */ -typedef struct mtx ieee80211_scan_lock_t; -#define IEEE80211_SCAN_LOCK_INIT(_nt, _name) \ - mtx_init(&(_nt)->nt_scanlock, _name, "802.11 node scangen", MTX_DEF) -#define IEEE80211_SCAN_LOCK_DESTROY(_nt) mtx_destroy(&(_nt)->nt_scanlock) -#define IEEE80211_SCAN_LOCK(_nt) mtx_lock(&(_nt)->nt_scanlock) -#define IEEE80211_SCAN_UNLOCK(_nt) mtx_unlock(&(_nt)->nt_scanlock) -#define IEEE80211_SCAN_LOCK_ASSERT(_nt) \ - mtx_assert(&(_nt)->nt_scanlock, MA_OWNED) +#define IEEE80211_NODE_ITERATE_LOCK(_nt) rw_rlock(&(_nt)->nt_nodelock) +#define IEEE80211_NODE_ITERATE_UNLOCK(_nt) rw_runlock(&(_nt)->nt_nodelock) #define _AGEQ_ENQUEUE(_ifq, _m, _qlen, _age) do { \ (_m)->m_nextpkt = NULL; \ ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#28 (text+ko) ==== @@ -1699,9 +1699,9 @@ const char *name, int inact, int keyixmax) { nt->nt_ic = ic; - /* XXX need unit */ - IEEE80211_NODE_LOCK_INIT(nt, ic->ic_ifp->if_xname); - IEEE80211_SCAN_LOCK_INIT(nt, ic->ic_ifp->if_xname); + snprintf(nt->nt_lockname, sizeof(nt->nt_lockname), "%s_node_lock", + ic->ic_ifp->if_xname); + IEEE80211_NODE_LOCK_INIT(nt, nt->nt_lockname); TAILQ_INIT(&nt->nt_node); nt->nt_name = name; nt->nt_scangen = 1; @@ -1772,7 +1772,6 @@ FREE(nt->nt_keyixmap, M_80211_NODE); nt->nt_keyixmap = NULL; } - IEEE80211_SCAN_LOCK_DESTROY(nt); IEEE80211_NODE_LOCK_DESTROY(nt); } @@ -1792,12 +1791,15 @@ struct ieee80211_node_table *nt = &ic->ic_sta; struct ieee80211vap *vap; struct ieee80211_node *ni; - u_int gen; + int gen = 0; - IEEE80211_SCAN_LOCK(nt); - gen = ++nt->nt_scangen; restart: IEEE80211_NODE_LOCK(nt); + if (gen == 0) { + gen = ++nt->nt_scangen; + if (nt->nt_scangen == 0) /* NB: 0 is never used */ + nt->nt_scangen++; + } TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { if (ni->ni_scangen == gen) /* previously handled */ continue; @@ -1918,8 +1920,6 @@ } } IEEE80211_NODE_UNLOCK(nt); - - IEEE80211_SCAN_UNLOCK(nt); } /* @@ -2006,25 +2006,26 @@ ieee80211_iterate_nodes(struct ieee80211_node_table *nt, ieee80211_iter_func *f, void *arg) { struct ieee80211_node *ni; - u_int gen; + u_int gen = 0; - IEEE80211_SCAN_LOCK(nt); - gen = ++nt->nt_scangen; restart: - IEEE80211_NODE_LOCK(nt); + IEEE80211_NODE_ITERATE_LOCK(nt); + if (gen == 0) { + gen = ++nt->nt_scangen; + if (nt->nt_scangen == 0) /* NB: 0 is never used */ + nt->nt_scangen++; + } TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { if (ni->ni_scangen != gen) { ni->ni_scangen = gen; (void) ieee80211_ref_node(ni); - IEEE80211_NODE_UNLOCK(nt); + IEEE80211_NODE_ITERATE_UNLOCK(nt); (*f)(arg, ni); ieee80211_free_node(ni); goto restart; } } - IEEE80211_NODE_UNLOCK(nt); - - IEEE80211_SCAN_UNLOCK(nt); + IEEE80211_NODE_ITERATE_UNLOCK(nt); } void ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#18 (text+ko) ==== @@ -295,13 +295,13 @@ */ struct ieee80211_node_table { struct ieee80211com *nt_ic; /* back reference */ + char nt_lockname[16];/* e.g. "ath0_node_lock" */ ieee80211_node_lock_t nt_nodelock; /* on node table */ TAILQ_HEAD(, ieee80211_node) nt_node; /* information of all nodes */ LIST_HEAD(, ieee80211_node) nt_hash[IEEE80211_NODE_HASHSIZE]; struct ieee80211_node **nt_keyixmap; /* key ix -> node map */ int nt_keyixmax; /* keyixmap size */ const char *nt_name; /* for debugging */ - ieee80211_scan_lock_t nt_scanlock; /* on nt_scangen */ u_int nt_scangen; /* gen# for timeout scan */ int nt_inact_init; /* initial node inact setting */ }; From owner-p4-projects@FreeBSD.ORG Mon Apr 7 17:19:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28DD31065672; Mon, 7 Apr 2008 17:19:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C6190106566C for ; Mon, 7 Apr 2008 17:19:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ABC228FC1C for ; Mon, 7 Apr 2008 17:19:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m37HJnJt071347 for ; Mon, 7 Apr 2008 17:19:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m37HJnIe071345 for perforce@freebsd.org; Mon, 7 Apr 2008 17:19:49 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Apr 2008 17:19:49 GMT Message-Id: <200804071719.m37HJnIe071345@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 Cc: Subject: PERFORCE change 139525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 17:19:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=139525 Change 139525 by sam@sam_ebb on 2008/04/07 17:19:37 o add RTM_IEEE80211_RADIO event to notify user space when the rfkill switch state chagnes (not sure if this should be used for other radio state changes that would otherwise appear as link state changes) o change RTM_IEEE80211_COUNTRY event to include the bssid of the ap from which the country code was extracted; user apps will likely respond to this event by collecting current scan results so this allows them to find the entry (but this also begs the question of whether this event is even needed as a user app can extract the same info from the scan results now that we return the entire set of ie's in the scan resul data) Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#27 edit .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#24 edit .. //depot/projects/vap/sys/net80211/ieee80211_proto.h#19 edit .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#23 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#27 (text+ko) ==== @@ -627,18 +627,31 @@ } void -ieee80211_notify_country(struct ieee80211vap *vap, const uint8_t cc[2]) +ieee80211_notify_country(struct ieee80211vap *vap, + const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t cc[2]) { struct ifnet *ifp = vap->iv_ifp; struct ieee80211_country_event iev; memset(&iev, 0, sizeof(iev)); + IEEE80211_ADDR_COPY(iev.iev_addr, bssid); iev.iev_cc[0] = cc[0]; iev.iev_cc[1] = cc[1]; rt_ieee80211msg(ifp, RTM_IEEE80211_COUNTRY, &iev, sizeof(iev)); } void +ieee80211_notify_radio(struct ieee80211com *ic, int state) +{ + struct ifnet *ifp = ic->ic_ifp; + struct ieee80211_radio_event iev; + + memset(&iev, 0, sizeof(iev)); + iev.iev_state = state; + rt_ieee80211msg(ifp, RTM_IEEE80211_RADIO, &iev, sizeof(iev)); +} + +void ieee80211_load_module(const char *modname) { ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#24 (text+ko) ==== @@ -458,9 +458,14 @@ }; struct ieee80211_country_event { + uint8_t iev_addr[6]; uint8_t iev_cc[2]; /* ISO country code */ }; +struct ieee80211_radio_event { + uint8_t iev_state; /* 1 on, 0 off */ +}; + #define RTM_IEEE80211_ASSOC 100 /* station associate (bss mode) */ #define RTM_IEEE80211_REASSOC 101 /* station re-associate (bss mode) */ #define RTM_IEEE80211_DISASSOC 102 /* station disassociate (bss mode) */ @@ -477,6 +482,7 @@ #define RTM_IEEE80211_DEAUTH 113 /* station deauthenticate */ #define RTM_IEEE80211_AUTH 114 /* station authenticate (ap mode) */ #define RTM_IEEE80211_COUNTRY 115 /* discovered country code (sta mode) */ +#define RTM_IEEE80211_RADIO 116 /* RF kill switch state change */ /* * Structure prepended to raw packets sent through the bpf ==== //depot/projects/vap/sys/net80211/ieee80211_proto.h#19 (text+ko) ==== @@ -354,5 +354,7 @@ enum ieee80211_notify_cac_event); void ieee80211_notify_node_deauth(struct ieee80211_node *); void ieee80211_notify_node_auth(struct ieee80211_node *); -void ieee80211_notify_country(struct ieee80211vap *, const uint8_t cc[2]); +void ieee80211_notify_country(struct ieee80211vap *, const uint8_t [], + const uint8_t cc[2]); +void ieee80211_notify_radio(struct ieee80211com *, int); #endif /* _NET80211_IEEE80211_PROTO_H_ */ ==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#23 (text+ko) ==== @@ -322,7 +322,8 @@ !isocmp(cie->cc, ic->ic_regdomain.isocc))) { /* only issue one notify event per scan */ if (se->se_countrygen != st->st_scangen) { - ieee80211_notify_country(vap, cie->cc); + ieee80211_notify_country(vap, ise->se_bssid, + cie->cc); se->se_countrygen = st->st_scangen; } } From owner-p4-projects@FreeBSD.ORG Mon Apr 7 17:20:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FEF91065679; Mon, 7 Apr 2008 17:20:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E67A11065676 for ; Mon, 7 Apr 2008 17:20:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D71368FC2F for ; Mon, 7 Apr 2008 17:20:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m37HKoCJ071453 for ; Mon, 7 Apr 2008 17:20:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m37HKo7I071451 for perforce@freebsd.org; Mon, 7 Apr 2008 17:20:50 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Apr 2008 17:20:50 GMT Message-Id: <200804071720.m37HKo7I071451@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 Cc: Subject: PERFORCE change 139526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 17:20:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=139526 Change 139526 by sam@sam_ebb on 2008/04/07 17:19:55 update to show country and radio events Affected files ... .. //depot/projects/vap/tools/tools/net80211/wlanwatch/wlanwatch.c#7 edit Differences ... ==== //depot/projects/vap/tools/tools/net80211/wlanwatch/wlanwatch.c#7 (text+ko) ==== @@ -434,6 +434,16 @@ printf("%s node authenticate", ether_sprintf(V(ieee80211_auth_event)->iev_addr)); break; + case RTM_IEEE80211_COUNTRY: + printf("%s adopt country code '%c%c'", + ether_sprintf(V(ieee80211_country_event)->iev_addr), + V(ieee80211_country_event)->iev_cc[0], + V(ieee80211_country_event)->iev_cc[1]); + break; + case RTM_IEEE80211_RADIO: + printf("radio %s", + V(ieee80211_radio_event)->iev_state ? "ON" : "OFF"); + break; default: printf("what: #%d", ifan->ifan_what); break; From owner-p4-projects@FreeBSD.ORG Mon Apr 7 17:20:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86409106566C; Mon, 7 Apr 2008 17:20:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14F971065677 for ; Mon, 7 Apr 2008 17:20:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0595F8FC0C for ; Mon, 7 Apr 2008 17:20:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m37HKoVV071458 for ; Mon, 7 Apr 2008 17:20:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m37HKob6071456 for perforce@freebsd.org; Mon, 7 Apr 2008 17:20:50 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Apr 2008 17:20:50 GMT Message-Id: <200804071720.m37HKob6071456@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 Cc: Subject: PERFORCE change 139527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 17:20:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=139527 Change 139527 by sam@sam_ebb on 2008/04/07 17:20:13 hookup new radio events Affected files ... .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#22 edit Differences ... ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#22 (text+ko) ==== @@ -3237,10 +3237,12 @@ iwi_radio_on(void *arg, int pending) { struct iwi_softc *sc = arg; + struct ieee80211com *ic = sc->sc_ifp->if_l2com; device_printf(sc->sc_dev, "radio turned on\n"); iwi_init(sc); + ieee80211_notify_radio(ic, 1); } static void @@ -3267,10 +3269,13 @@ iwi_radio_off(void *arg, int pending) { struct iwi_softc *sc = arg; + struct ieee80211com *ic = sc->sc_ifp->if_l2com; IWI_LOCK_DECL; device_printf(sc->sc_dev, "radio turned off\n"); + ieee80211_notify_radio(ic, 0); + IWI_LOCK(sc); iwi_stop_locked(sc); iwi_rfkill_poll(sc); From owner-p4-projects@FreeBSD.ORG Mon Apr 7 20:06:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91B391065681; Mon, 7 Apr 2008 20:06:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51D65106566B for ; Mon, 7 Apr 2008 20:06:54 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F3418FC26 for ; Mon, 7 Apr 2008 20:06:54 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m37K6sCo081881 for ; Mon, 7 Apr 2008 20:06:54 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m37K6s3N081879 for perforce@freebsd.org; Mon, 7 Apr 2008 20:06:54 GMT (envelope-from piso@freebsd.org) Date: Mon, 7 Apr 2008 20:06:54 GMT Message-Id: <200804072006.m37K6s3N081879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 139541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 20:06:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=139541 Change 139541 by piso@piso_newluxor on 2008/04/07 20:06:31 -don't pass to Libalias pkts coming from layer2 -reassemble packet before passing it to libalias (much like ip_divert does) -refresh ip ptr after passing it down in LibAliasLockedIn() -some more debug around This make libalias work with mbuf, modules are not ready. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#7 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#75 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#7 (text+ko) ==== @@ -250,9 +250,8 @@ int ldt, retval; /* ipfw_nat works only at layer 3 */ - if (args->eh != NULL) { - // XXX get out - } + if (args->eh != NULL) + goto badnat; ldt = 0; retval = 0; @@ -260,11 +259,13 @@ NULL) goto badnat; ip = mtod(m, struct ip *); + printf("%s()::%d - ip->ip_off: %d\n", __FUNCTION__, __LINE__, ip->ip_off); if (ip->ip_off & (IP_MF | IP_OFFMASK)) { - struct mbuf *reass = NULL; + struct mbuf *reass; + printf("fragment found\n"); /* Reassemble packet. */ - //reass = ip_reass(m); + reass = ip_reass(m); /* * IP header checksum fixup after reassembly and leave header @@ -284,7 +285,7 @@ ip->ip_sum = in_cksum(reass, hlen); m = reass; } else { - printf("fragment found\n"); + printf("can't reass\n"); m = NULL; goto badnat; } ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#75 (text+ko) ==== @@ -1282,7 +1282,7 @@ iresult = PKT_ALIAS_IGNORED; if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0) { - printf("%d\n", __LINE__); + printf("%s()::%d - ip->ip_off: %d\n", __FUNCTION__, __LINE__, pip->ip_off); switch (pip->ip_p) { case IPPROTO_ICMP: printf("%d\n", __LINE__); @@ -1324,9 +1324,11 @@ break; } + PULLUP_IPHDR(pip, ptr); if (ntohs(pip->ip_off) & IP_MF) { struct alias_link *lnk; + printf("%s()::%d - ip->ip_off: %d\n", __FUNCTION__, __LINE__, pip->ip_off); lnk = FindFragmentIn1(la, pip->ip_src, alias_addr, pip->ip_id); if (lnk != NULL) { iresult = PKT_ALIAS_FOUND_HEADER_FRAGMENT; @@ -1336,7 +1338,7 @@ } } } else { - printf("%d\n", __LINE__); + printf("%s()::%d - ip->ip_off: %d\n", __FUNCTION__, __LINE__, pip->ip_off); iresult = FragmentIn(la, pip->ip_src, &pip->ip_dst, pip->ip_id, &pip->ip_sum); } From owner-p4-projects@FreeBSD.ORG Mon Apr 7 21:12:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF9F21065670; Mon, 7 Apr 2008 21:12:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1B0E106566B for ; Mon, 7 Apr 2008 21:12:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A85A8FC25 for ; Mon, 7 Apr 2008 21:12:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m37LC4gh095658 for ; Mon, 7 Apr 2008 21:12:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m37LC4dB095656 for perforce@freebsd.org; Mon, 7 Apr 2008 21:12:04 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Apr 2008 21:12:04 GMT Message-Id: <200804072112.m37LC4dB095656@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 Cc: Subject: PERFORCE change 139542 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 21:12:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=139542 Change 139542 by sam@sam_ebb on 2008/04/07 21:11:18 add mountroot event to be notified when the rootvnode is valid; this replaces SI_SUB_MOUNT_ROOT which was made meaningless with the "devfs pivotroot changes" (to quote jhb) Affected files ... .. //depot/projects/vap/sys/kern/vfs_mount.c#11 edit .. //depot/projects/vap/sys/sys/eventhandler.h#6 edit Differences ... ==== //depot/projects/vap/sys/kern/vfs_mount.c#11 (text+ko) ==== @@ -1488,6 +1488,8 @@ FILEDESC_SUNLOCK(p->p_fd); VOP_UNLOCK(rootvnode, 0); + + EVENTHANDLER_INVOKE(mountroot); } /* ==== //depot/projects/vap/sys/sys/eventhandler.h#6 (text+ko) ==== @@ -171,6 +171,10 @@ typedef void (*vfs_lowvnodes_handler_t)(void *, int); EVENTHANDLER_DECLARE(vfs_lowvnodes, vfs_lowvnodes_handler_t); +/* Root mounted event */ +typedef void (*mountroot_handler_t)(void *); +EVENTHANDLER_DECLARE(mountroot, mountroot_handler_t); + /* * Process events * process_fork and exit handlers are called without Giant. From owner-p4-projects@FreeBSD.ORG Mon Apr 7 21:13:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1840C1065673; Mon, 7 Apr 2008 21:13:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CECB81065670 for ; Mon, 7 Apr 2008 21:13:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B63788FC18 for ; Mon, 7 Apr 2008 21:13:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m37LD5TE095704 for ; Mon, 7 Apr 2008 21:13:05 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m37LD5l5095702 for perforce@freebsd.org; Mon, 7 Apr 2008 21:13:05 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Apr 2008 21:13:05 GMT Message-Id: <200804072113.m37LD5l5095702@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 Cc: Subject: PERFORCE change 139543 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 21:13:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=139543 Change 139543 by sam@sam_ebb on 2008/04/07 21:12:02 nuke SI_SUB_MOUNT_ROOT; it's meanginless Affected files ... .. //depot/projects/vap/sys/sys/kernel.h#8 edit Differences ... ==== //depot/projects/vap/sys/sys/kernel.h#8 (text+ko) ==== @@ -153,7 +153,6 @@ SI_SUB_ROOT_CONF = 0xb000000, /* Find root devices */ SI_SUB_DUMP_CONF = 0xb200000, /* Find dump devices */ SI_SUB_RAID = 0xb380000, /* Configure GEOM classes */ - SI_SUB_MOUNT_ROOT = 0xb400000, /* root mount*/ SI_SUB_SWAP = 0xc000000, /* swap */ SI_SUB_INTRINSIC_POST = 0xd000000, /* proc 0 cleanup*/ SI_SUB_SYSCALLS = 0xd800000, /* register system calls */ From owner-p4-projects@FreeBSD.ORG Mon Apr 7 21:24:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A90D106566C; Mon, 7 Apr 2008 21:24:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D0041065672 for ; Mon, 7 Apr 2008 21:24:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 354708FC1D for ; Mon, 7 Apr 2008 21:24:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m37LOIlt096103 for ; Mon, 7 Apr 2008 21:24:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m37LOIlL096101 for perforce@freebsd.org; Mon, 7 Apr 2008 21:24:18 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Apr 2008 21:24:18 GMT Message-Id: <200804072124.m37LOIlL096101@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 Cc: Subject: PERFORCE change 139544 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 21:24:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=139544 Change 139544 by sam@sam_ebb on 2008/04/07 21:23:17 change taskqueue_start_threads to create threads of proc0 instead of procs; note this means these are no longer visible (by default) in ps, top, etc. Affected files ... .. //depot/projects/vap/sys/kern/subr_taskqueue.c#7 edit Differences ... ==== //depot/projects/vap/sys/kern/subr_taskqueue.c#7 (text+ko) ==== @@ -56,8 +56,8 @@ void *tq_context; struct task *tq_running; struct mtx tq_mutex; - struct proc **tq_pproc; - int tq_pcount; + struct thread **tq_threads; + int tq_tcount; int tq_spin; int tq_flags; }; @@ -143,10 +143,10 @@ * Signal a taskqueue thread to terminate. */ static void -taskqueue_terminate(struct proc **pp, struct taskqueue *tq) +taskqueue_terminate(struct thread **pp, struct taskqueue *tq) { - while (tq->tq_pcount > 0) { + while (tq->tq_tcount > 0) { wakeup(tq); TQ_SLEEP(tq, pp, &tq->tq_mutex, PWAIT, "taskqueue_destroy", 0); } @@ -163,9 +163,9 @@ TQ_LOCK(queue); queue->tq_flags &= ~TQ_FLAGS_ACTIVE; taskqueue_run(queue); - taskqueue_terminate(queue->tq_pproc, queue); + taskqueue_terminate(queue->tq_threads, queue); mtx_destroy(&queue->tq_mutex); - free(queue->tq_pproc, M_TASKQUEUE); + free(queue->tq_threads, M_TASKQUEUE); free(queue, M_TASKQUEUE); } @@ -341,45 +341,47 @@ const char *name, ...) { va_list ap; + struct thread *td; struct taskqueue *tq; - struct thread *td; + int i, error; char ktname[MAXCOMLEN]; - int i, error; if (count <= 0) return (EINVAL); + tq = *tqp; va_start(ap, name); vsnprintf(ktname, MAXCOMLEN, name, ap); va_end(ap); - tq->tq_pproc = malloc(sizeof(struct proc *) * count, M_TASKQUEUE, + tq->tq_threads = malloc(sizeof(struct thread *) * count, M_TASKQUEUE, M_NOWAIT | M_ZERO); - if (tq->tq_pproc == NULL) { + if (tq->tq_threads == NULL) { printf("%s: no memory for %s threads\n", __func__, ktname); return (ENOMEM); } for (i = 0; i < count; i++) { if (count == 1) - error = kproc_create(taskqueue_thread_loop, tqp, - &tq->tq_pproc[i], RFSTOPPED, 0, ktname); + error = kthread_add(taskqueue_thread_loop, tqp, NULL, + &tq->tq_threads[i], RFSTOPPED, 0, ktname); else - error = kproc_create(taskqueue_thread_loop, tqp, - &tq->tq_pproc[i], RFSTOPPED, 0, "%s_%d", ktname, i); + error = kthread_add(taskqueue_thread_loop, tqp, NULL, + &tq->tq_threads[i], RFSTOPPED, 0, + "%s_%d", ktname, i); if (error) { /* should be ok to continue, taskqueue_free will dtrt */ - printf("%s: kproc_create(%s): error %d", - __func__, ktname, error); - tq->tq_pproc[i] = NULL; /* paranoid */ + printf("%s: kthread_add(%s): error %d", __func__, + ktname, error); + tq->tq_threads[i] = NULL; /* paranoid */ } else - tq->tq_pcount++; + tq->tq_tcount++; } for (i = 0; i < count; i++) { - if (tq->tq_pproc[i] == NULL) + if (tq->tq_threads[i] == NULL) continue; - td = FIRST_THREAD_IN_PROC(tq->tq_pproc[i]); + td = tq->tq_threads[i]; thread_lock(td); sched_prio(td, pri); sched_add(td, SRQ_BORING); @@ -403,8 +405,8 @@ } while ((tq->tq_flags & TQ_FLAGS_ACTIVE) != 0); /* rendezvous with thread that asked us to terminate */ - tq->tq_pcount--; - wakeup_one(tq->tq_pproc); + tq->tq_tcount--; + wakeup_one(tq->tq_threads); TQ_UNLOCK(tq); kproc_exit(0); } From owner-p4-projects@FreeBSD.ORG Mon Apr 7 21:29:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BDC41065672; Mon, 7 Apr 2008 21:29:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F258F1065670 for ; Mon, 7 Apr 2008 21:29:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE0338FC1E for ; Mon, 7 Apr 2008 21:29:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m37LTORw096271 for ; Mon, 7 Apr 2008 21:29:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m37LTOTQ096269 for perforce@freebsd.org; Mon, 7 Apr 2008 21:29:24 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Apr 2008 21:29:24 GMT Message-Id: <200804072129.m37LTOTQ096269@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 Cc: Subject: PERFORCE change 139545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2008 21:29:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=139545 Change 139545 by sam@sam_ebb on 2008/04/07 21:28:26 Fix longstanding issue with firmware_get requests blowing up due to the thread not having sufficient context to do file i/o: o create a private taskqueue and thread and setup the thread with root+current directory o bounce module load requests to the private thread so we know i/o can be done o use private q+thread for unload requests too Affected files ... .. //depot/projects/vap/sys/kern/subr_firmware.c#3 edit Differences ... ==== //depot/projects/vap/sys/kern/subr_firmware.c#3 (text+ko) ==== @@ -41,7 +41,11 @@ #include #include #include +#include +#include +#include + /* * Loadable firmware support. See sys/sys/firmware.h and firmware(9) * form more details on the subsystem. @@ -89,7 +93,7 @@ /* * 'file' is private info managed by the autoload/unload code. * Set at the end of firmware_get(), cleared only in the - * firmware_task, so the latter can depend on its value even + * firmware_unload_task, so the latter can depend on its value even * while the lock is not held. */ linker_file_t file; /* module file, if autoloaded */ @@ -121,14 +125,16 @@ static struct priv_fw firmware_table[FIRMWARE_MAX]; /* - * module release are handled in a separate task as they might sleep. + * Firmware module operations are handled in a separate task as they + * might sleep and they require directory context to do i/o. */ -struct task firmware_task; +static struct taskqueue *firmware_tq; +static struct task firmware_unload_task; /* * This mutex protects accesses to the firmware table. */ -struct mtx firmware_mtx; +static struct mtx firmware_mtx; MTX_SYSINIT(firmware, &firmware_mtx, "firmware table", MTX_DEF); /* @@ -227,7 +233,7 @@ } else if (fp->refcnt != 0) { /* cannot unregister */ err = EBUSY; } else { - linker_file_t x = fp->file; /* save value */ + linker_file_t x = fp->file; /* save value */ if (fp->parent != NULL) /* release parent reference */ fp->parent->refcnt--; @@ -244,6 +250,46 @@ return err; } +static void +loadimage(void *arg, int npending) +{ + struct thread *td = curthread; + char *imagename = arg; + struct priv_fw *fp; + linker_file_t result; + int error; + + /* synchronize with the thread that dispatched us */ + mtx_lock(&firmware_mtx); + mtx_unlock(&firmware_mtx); + + /* XXX unlocked, necessary? */ + if (td->td_proc->p_fd->fd_rdir == NULL) { + printf("%s: root not mounted yet, no way to load image\n", + imagename); + goto done; + } + error = linker_reference_module(imagename, NULL, &result); + if (error != 0) { + printf("%s: could not load firmware image, error %d\n", + imagename, error); + goto done; + } + + mtx_lock(&firmware_mtx); + fp = lookup(imagename, NULL); + if (fp == NULL || fp->file != NULL) { + if (fp == NULL) + printf("%s: firmware image loaded, " + "but did not register\n", imagename); + (void) linker_release_module(imagename, NULL, NULL); + } else + fp->file = result; /* record the module identity */ + mtx_unlock(&firmware_mtx); +done: + wakeup_one(imagename); /* we're done */ +} + /* * Lookup and potentially load the specified firmware image. * If the firmware is not found in the registry, try to load a kernel @@ -254,9 +300,9 @@ const struct firmware * firmware_get(const char *imagename) { + struct task fwload_task; struct thread *td; struct priv_fw *fp; - linker_file_t result; mtx_lock(&firmware_mtx); fp = lookup(imagename, NULL); @@ -265,29 +311,30 @@ /* * Image not present, try to load the module holding it. */ - mtx_unlock(&firmware_mtx); td = curthread; if (priv_check(td, PRIV_FIRMWARE_LOAD) != 0 || securelevel_gt(td->td_ucred, 0) != 0) { + mtx_unlock(&firmware_mtx); printf("%s: insufficient privileges to " "load firmware image %s\n", __func__, imagename); return NULL; } - (void) linker_reference_module(imagename, NULL, &result); + /* + * Defer load to a thread with known context. linker_reference_module + * may do filesystem i/o which requires root & current dirs, etc. + * Also we must not hold any mtx's over this call which is problematic. + */ + TASK_INIT(&fwload_task, 0, loadimage, __DECONST(void *, imagename)); + taskqueue_enqueue(firmware_tq, &fwload_task); + msleep(__DECONST(void *, imagename), &firmware_mtx, 0, "fwload", 0); /* - * After loading the module, see if the image is registered now. + * After attempting to load the module, see if the image is registered. */ - mtx_lock(&firmware_mtx); fp = lookup(imagename, NULL); if (fp == NULL) { mtx_unlock(&firmware_mtx); - printf("%s: failed to load firmware image %s\n", - __func__, imagename); - (void) linker_release_module(imagename, NULL, NULL); return NULL; } - fp->file = result; /* record the module identity */ - found: /* common exit point on success */ fp->refcnt++; mtx_unlock(&firmware_mtx); @@ -300,8 +347,8 @@ * to release the resource, but the flag is only advisory. * * If this is the last reference to the firmware image, and this is an - * autoloaded module, wake up the firmware_task to figure out what to do - * with the associated module. + * autoloaded module, wake up the firmware_unload_task to figure out + * what to do with the associated module. */ void firmware_put(const struct firmware *p, int flags) @@ -314,12 +361,47 @@ if (flags & FIRMWARE_UNLOAD) fp->flags |= FW_UNLOAD; if (fp->file) - taskqueue_enqueue(taskqueue_thread, &firmware_task); + taskqueue_enqueue(firmware_tq, &firmware_unload_task); } mtx_unlock(&firmware_mtx); } /* + * Setup directory state for the firmware_tq thread so we can do i/o. + */ +static void +set_rootvnode(void *arg, int npending) +{ + struct thread *td = curthread; + struct proc *p = td->td_proc; + + FILEDESC_XLOCK(p->p_fd); + if (p->p_fd->fd_cdir == NULL) { + p->p_fd->fd_cdir = rootvnode; + VREF(rootvnode); + } + if (p->p_fd->fd_rdir == NULL) { + p->p_fd->fd_rdir = rootvnode; + VREF(rootvnode); + } + FILEDESC_XUNLOCK(p->p_fd); +} + +/* + * Event handler called on mounting of /. Bounce a task + * into the task queue thread to setup it's directories. + */ +static void +firmware_mountroot(void *arg) +{ + static struct task setroot_task; + + TASK_INIT(&setroot_task, 0, set_rootvnode, NULL); + taskqueue_enqueue(firmware_tq, &setroot_task); +} +EVENTHANDLER_DEFINE(mountroot, firmware_mountroot, NULL, 0); + +/* * The body of the task in charge of unloading autoloaded modules * that are not needed anymore. * Images can be cross-linked so we may need to make multiple passes, @@ -383,11 +465,16 @@ firmware_modevent(module_t mod, int type, void *unused) { struct priv_fw *fp; - int i, err = EINVAL; + int i, err; switch (type) { case MOD_LOAD: - TASK_INIT(&firmware_task, 0, unloadentry, NULL); + TASK_INIT(&firmware_unload_task, 0, unloadentry, NULL); + firmware_tq = taskqueue_create("taskqueue_firmware", M_WAITOK, + taskqueue_thread_enqueue, &firmware_tq); + /* NB: use our own loop routine that sets up context */ + (void) taskqueue_start_threads(&firmware_tq, 1, PWAIT, + "firmware taskq"); return 0; case MOD_UNLOAD: @@ -398,8 +485,9 @@ fp->flags |= FW_UNLOAD;; } mtx_unlock(&firmware_mtx); - taskqueue_enqueue(taskqueue_thread, &firmware_task); - taskqueue_drain(taskqueue_thread, &firmware_task); + taskqueue_enqueue(firmware_tq, &firmware_unload_task); + taskqueue_drain(firmware_tq, &firmware_unload_task); + err = 0; for (i = 0; i < FIRMWARE_MAX; i++) { fp = &firmware_table[i]; if (fp->fw.name != NULL) { @@ -409,6 +497,8 @@ err = EINVAL; } } + if (err == 0) + taskqueue_free(firmware_tq); return err; } return EINVAL; From owner-p4-projects@FreeBSD.ORG Tue Apr 8 01:26:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57BE41065672; Tue, 8 Apr 2008 01:26:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1876C106566C for ; Tue, 8 Apr 2008 01:26:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 044D58FC19 for ; Tue, 8 Apr 2008 01:26:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m381QrIU019925 for ; Tue, 8 Apr 2008 01:26:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m381Qqw0019922 for perforce@freebsd.org; Tue, 8 Apr 2008 01:26:52 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Apr 2008 01:26:52 GMT Message-Id: <200804080126.m381Qqw0019922@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 Cc: Subject: PERFORCE change 139549 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 01:26:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=139549 Change 139549 by sam@sam_ebb on 2008/04/08 01:26:37 handle the case where we're loaded after root is mounted Submitted by: mlaier Affected files ... .. //depot/projects/vap/sys/kern/subr_firmware.c#4 edit Differences ... ==== //depot/projects/vap/sys/kern/subr_firmware.c#4 (text+ko) ==== @@ -388,7 +388,7 @@ } /* - * Event handler called on mounting of /. Bounce a task + * Event handler called on mounting of /; bounce a task * into the task queue thread to setup it's directories. */ static void @@ -475,6 +475,13 @@ /* NB: use our own loop routine that sets up context */ (void) taskqueue_start_threads(&firmware_tq, 1, PWAIT, "firmware taskq"); + if (rootvnode != NULL) { + /* + * Root is already mounted so we won't get an event; + * simulate one here. + */ + firmware_mountroot(NULL); + } return 0; case MOD_UNLOAD: From owner-p4-projects@FreeBSD.ORG Tue Apr 8 01:28:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4D831065672; Tue, 8 Apr 2008 01:28:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86BE0106564A for ; Tue, 8 Apr 2008 01:28:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 590288FC0A for ; Tue, 8 Apr 2008 01:28:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m381SuO9019986 for ; Tue, 8 Apr 2008 01:28:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m381Su3h019984 for perforce@freebsd.org; Tue, 8 Apr 2008 01:28:56 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Apr 2008 01:28:56 GMT Message-Id: <200804080128.m381Su3h019984@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 Cc: Subject: PERFORCE change 139550 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 01:28:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=139550 Change 139550 by sam@sam_ebb on 2008/04/08 01:28:19 update copyright Affected files ... .. //depot/projects/vap/sys/kern/subr_firmware.c#5 edit Differences ... ==== //depot/projects/vap/sys/kern/subr_firmware.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005, Sam Leffler + * Copyright (c) 2005-2008, Sam Leffler * All rights reserved. * * Redistribution and use in source and binary forms, with or without From owner-p4-projects@FreeBSD.ORG Tue Apr 8 17:38:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C86AB1065689; Tue, 8 Apr 2008 17:38:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 893431065676 for ; Tue, 8 Apr 2008 17:38:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 75EC08FC23 for ; Tue, 8 Apr 2008 17:38:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m38HcrnO057674 for ; Tue, 8 Apr 2008 17:38:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m38HcqJt057672 for perforce@freebsd.org; Tue, 8 Apr 2008 17:38:52 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Apr 2008 17:38:52 GMT Message-Id: <200804081738.m38HcqJt057672@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 Cc: Subject: PERFORCE change 139599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 17:38:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=139599 Change 139599 by sam@sam_ebb on 2008/04/08 17:38:17 IFC @ 139598 Affected files ... .. //depot/projects/vap/bin/ls/ls.1#3 integrate .. //depot/projects/vap/bin/ls/ls.c#3 integrate .. //depot/projects/vap/bin/ls/ls.h#3 integrate .. //depot/projects/vap/bin/ls/print.c#3 integrate .. //depot/projects/vap/bin/ls/util.c#3 integrate .. //depot/projects/vap/etc/rc.d/ppp#5 integrate .. //depot/projects/vap/lib/libc/include/libc_private.h#3 integrate .. //depot/projects/vap/lib/libc/sys/Makefile.inc#6 integrate .. //depot/projects/vap/lib/libc/sys/Symbol.map#6 integrate .. //depot/projects/vap/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/vap/lib/libstand/nfs.c#3 integrate .. //depot/projects/vap/libexec/rtld-elf/mips/reloc.c#1 branch .. //depot/projects/vap/libexec/rtld-elf/mips/rtld_machdep.h#1 branch .. //depot/projects/vap/libexec/rtld-elf/mips/rtld_start.S#1 branch .. //depot/projects/vap/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/vap/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/vap/release/ia64/mkisoimages.sh#3 integrate .. //depot/projects/vap/sbin/ddb/ddb.8#3 integrate .. //depot/projects/vap/sbin/ddb/ddb.c#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/vap/sbin/gpt/gpt.c#4 integrate .. //depot/projects/vap/share/man/man4/asmc.4#3 integrate .. //depot/projects/vap/share/man/man4/bpf.4#4 integrate .. //depot/projects/vap/share/man/man9/Makefile#9 integrate .. //depot/projects/vap/share/man/man9/lock.9#9 integrate .. //depot/projects/vap/share/man/man9/sleep.9#3 integrate .. //depot/projects/vap/share/mk/sys.mk#5 integrate .. //depot/projects/vap/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/vap/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_dummy.c#5 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/vap/sys/amd64/linux32/syscalls.master#7 integrate .. //depot/projects/vap/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/vap/sys/arm/arm/exception.S#3 integrate .. //depot/projects/vap/sys/arm/arm/intr.c#6 integrate .. //depot/projects/vap/sys/arm/arm/locore.S#7 integrate .. //depot/projects/vap/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/files.ep80219#4 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/files.iq31244#4 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/iq31244_machdep.c#7 integrate .. //depot/projects/vap/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/vap/sys/arm/xscale/i8134x/files.i81342#3 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/files.avila#4 integrate .. //depot/projects/vap/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_file.c#8 integrate .. //depot/projects/vap/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/vap/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/vap/sys/compat/linux/linux_stats.c#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_util.c#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_util.h#6 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_sysvec.c#8 integrate .. //depot/projects/vap/sys/conf/Makefile.arm#8 integrate .. //depot/projects/vap/sys/conf/options#18 integrate .. //depot/projects/vap/sys/dev/aac/aac_disk.c#6 integrate .. //depot/projects/vap/sys/dev/acpica/Osd/OsdSynch.c#5 integrate .. //depot/projects/vap/sys/dev/acpica/acpi.c#10 integrate .. //depot/projects/vap/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/vap/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/vap/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/vap/sys/dev/de/if_de.c#3 integrate .. //depot/projects/vap/sys/dev/mii/ip1000phy.c#3 integrate .. //depot/projects/vap/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/vap/sys/dev/mii/miidevs#7 integrate .. //depot/projects/vap/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/vap/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/vap/sys/fs/fdescfs/fdesc_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/vap/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/vap/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/vap/sys/i386/ibcs2/ibcs2_util.c#5 integrate .. //depot/projects/vap/sys/i386/linux/linux.h#6 integrate .. //depot/projects/vap/sys/i386/linux/linux_dummy.c#5 integrate .. //depot/projects/vap/sys/i386/linux/linux_proto.h#7 integrate .. //depot/projects/vap/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/vap/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/vap/sys/i386/linux/linux_sysvec.c#9 integrate .. //depot/projects/vap/sys/i386/linux/syscalls.master#7 integrate .. //depot/projects/vap/sys/ia64/ia64/interrupt.c#7 integrate .. //depot/projects/vap/sys/kern/kern_cpuset.c#5 integrate .. //depot/projects/vap/sys/kern/kern_intr.c#9 integrate .. //depot/projects/vap/sys/kern/kern_lock.c#11 integrate .. //depot/projects/vap/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/vap/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/vap/sys/kern/kern_timeout.c#10 integrate .. //depot/projects/vap/sys/kern/sched_ule.c#12 integrate .. //depot/projects/vap/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/vap/sys/kern/vfs_syscalls.c#10 integrate .. //depot/projects/vap/sys/modules/asmc/Makefile#3 integrate .. //depot/projects/vap/sys/net/bpf.c#11 integrate .. //depot/projects/vap/sys/net/bpf_zerocopy.c#4 integrate .. //depot/projects/vap/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/vap/sys/net/if_loop.c#8 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#15 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/vap/sys/netinet/tcp.h#6 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/vap/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/vap/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/vap/sys/pc98/cbus/sc_machdep.h#3 integrate .. //depot/projects/vap/sys/pc98/cbus/syscons_cbus.c#4 integrate .. //depot/projects/vap/sys/powerpc/include/atomic.h#7 integrate .. //depot/projects/vap/sys/powerpc/powerpc/intr_machdep.c#9 integrate .. //depot/projects/vap/sys/sparc64/sparc64/intr_machdep.c#7 integrate .. //depot/projects/vap/sys/sun4v/sun4v/intr_machdep.c#4 integrate .. //depot/projects/vap/sys/sys/_lockmgr.h#1 branch .. //depot/projects/vap/sys/sys/_stack.h#1 branch .. //depot/projects/vap/sys/sys/cpuset.h#5 integrate .. //depot/projects/vap/sys/sys/interrupt.h#6 integrate .. //depot/projects/vap/sys/sys/lockmgr.h#12 integrate .. //depot/projects/vap/sys/sys/param.h#15 integrate .. //depot/projects/vap/sys/sys/proc.h#13 integrate .. //depot/projects/vap/sys/sys/sleepqueue.h#6 integrate .. //depot/projects/vap/sys/sys/stack.h#4 integrate .. //depot/projects/vap/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/vap/sys/sys/vnode.h#11 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#11 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_gjournal.c#3 integrate .. //depot/projects/vap/sys/vm/uma.h#6 integrate .. //depot/projects/vap/sys/vm/uma_core.c#6 integrate .. //depot/projects/vap/sys/vm/vm_map.c#8 integrate .. //depot/projects/vap/sys/vm/vm_page.c#9 integrate .. //depot/projects/vap/sys/vm/vm_phys.c#4 integrate .. //depot/projects/vap/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/vap/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/vap/tools/tools/README#4 integrate .. //depot/projects/vap/usr.bin/gprof/gprof.h#3 integrate .. //depot/projects/vap/usr.bin/xlint/lint1/param.h#3 integrate .. //depot/projects/vap/usr.sbin/btxld/btxld.c#3 integrate .. //depot/projects/vap/usr.sbin/rpc.lockd/lockd.c#4 integrate .. //depot/projects/vap/usr.sbin/rpc.statd/statd.c#3 integrate .. //depot/projects/vap/usr.sbin/sysinstall/devices.c#3 integrate Differences ... ==== //depot/projects/vap/bin/ls/ls.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $ .\" -.Dd October 12, 2006 +.Dd April 4, 2008 .Dt LS 1 .Os .Sh NAME @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1 +.Op Fl D Ar format .Op Ar .Sh DESCRIPTION For each operand that names a @@ -88,6 +89,21 @@ is the numeric value of the character in octal. .It Fl C Force multi-column output; this is the default when output is to a terminal. +.It Fl D Ar format +When printing in the long +.Pq Fl l +format, use +.Ar format +to format the date and time output. +The argument +.Ar format +is a string used by +.Xr strftime 3 . +Depending on the choice of format string, this may result in a +different number of columns in the output. +This option overrides the +.Fl T +option. .It Fl F Display a slash .Pq Ql / @@ -146,12 +162,13 @@ Sort by size (largest file first) before sorting the operands in lexicographical order. .It Fl T -When used with the -.Fl l -(lowercase letter -.Dq ell ) -option, display complete time information for the file, including +When printing in the long +.Pq Fl l +format, display complete time information for the file, including month, day, hour, minute, second, and year. +The +.Fl D +option gives even more control over the output format. .It Fl U Use time when file was created for sorting or printing. .It Fl W @@ -325,7 +342,12 @@ modified, and the pathname. .Pp If the modification time of the file is more than 6 months -in the past or future, then the year of the last modification +in the past or future, and the +.Fl D +or +.Fl T +are not specified, +then the year of the last modification is displayed in place of the hour and minute fields. .Pp If the owner or group names are not a known user or group name, @@ -657,6 +679,7 @@ .Xr getfacl 1 , .Xr sort 1 , .Xr xterm 1 , +.Xr strftime 3 , .Xr termcap 5 , .Xr maclabel 7 , .Xr symlink 7 , ==== //depot/projects/vap/bin/ls/ls.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $"); #include #include @@ -125,10 +125,11 @@ static int f_singlecol; /* use single column output */ int f_size; /* list size in short listing */ int f_slash; /* similar to f_type, but only for dirs */ - int f_sortacross; /* sort across rows, not down columns */ + int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ + char *f_timeformat; /* user-specified time format */ static int f_sizesort; int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -179,7 +180,7 @@ fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCD:FGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -198,6 +199,9 @@ case 'C': f_sortacross = f_longform = f_singlecol = 0; break; + case 'D': + f_timeformat = optarg; + break; case 'l': f_longform = 1; f_singlecol = 0; ==== //depot/projects/vap/bin/ls/ls.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $ */ #define NO_PRINT 1 @@ -50,8 +50,9 @@ extern int f_sectime; /* print the real time for all files */ extern int f_size; /* list size in short listing */ extern int f_slash; /* append a '/' if the file is a directory */ -extern int f_sortacross; /* sort across rows, not down columns */ +extern int f_sortacross; /* sort across rows, not down columns */ extern int f_statustime; /* use time of last mode change */ +extern char *f_timeformat; /* user-specified time format */ extern int f_notabs; /* don't use tab-separated multi-col output */ extern int f_type; /* add type character for non-regular files */ #ifdef COLORLS ==== //depot/projects/vap/bin/ls/print.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $"); #include #include @@ -237,7 +237,7 @@ if (chcnt) putchar('\n'); } - + void printcol(const DISPLAY *dp) { @@ -378,17 +378,20 @@ now = time(NULL); #define SIXMONTHS ((365 / 2) * 86400) - if (f_sectime) + if (f_timeformat) /* user specified format */ + format = f_timeformat; + else if (f_sectime) /* mmm dd hh:mm:ss yyyy || dd mmm hh:mm:ss yyyy */ - format = d_first ? "%e %b %T %Y " : "%b %e %T %Y "; + format = d_first ? "%e %b %T %Y" : "%b %e %T %Y"; else if (ftime + SIXMONTHS > now && ftime < now + SIXMONTHS) /* mmm dd hh:mm || dd mmm hh:mm */ - format = d_first ? "%e %b %R " : "%b %e %R "; + format = d_first ? "%e %b %R" : "%b %e %R"; else /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y " : "%b %e %Y "; + format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); + fputc(' ', stdout); } static int @@ -625,7 +628,7 @@ snprintf(name, sizeof(name), "%s", p->fts_name); else snprintf(name, sizeof(name), "%s/%s", - p->fts_parent->fts_accpath, p->fts_name); + p->fts_parent->fts_accpath, p->fts_name); /* * We have no way to tell whether a symbolic link has an ACL since * pathconf() and acl_get_file() both follow them. They also don't ==== //depot/projects/vap/bin/ls/util.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.40 2006/03/24 16:38:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.41 2008/04/04 05:55:42 ru Exp $"); #include #include @@ -222,9 +222,9 @@ { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #else - "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #endif " [file ...]\n"); exit(1); ==== //depot/projects/vap/etc/rc.d/ppp#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.18 2008/03/28 07:57:51 brooks Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.19 2008/04/06 20:39:33 brooks Exp $ # # PROVIDE: ppp @@ -61,7 +61,7 @@ # Check for hard wired unit eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit - if [ -n "_ppp_unit" ]; then + if [ -n "${_ppp_unit}" ]; then _ppp_unit="-unit${_ppp_unit}" fi rc_flags="$rc_flags $_ppp_unit" ==== //depot/projects/vap/lib/libc/include/libc_private.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.17 2007/07/04 23:27:38 peter Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.18 2008/04/04 09:43:03 dfr Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -192,4 +192,7 @@ extern __ssize_t __sys_freebsd6_pwrite(int, const void *, __size_t, int, __off_t); extern void * __sys_freebsd6_mmap(void *, __size_t, int, int, int, int, __off_t); +/* Without back-compat translation */ +extern int __sys_fcntl(int, int, ...); + #endif /* _LIBC_PRIVATE_H_ */ ==== //depot/projects/vap/lib/libc/sys/Makefile.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.132 2008/03/29 10:26:29 jeff Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.133 2008/04/04 09:43:03 dfr Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -20,7 +20,8 @@ # Sources common to both syscall interfaces: SRCS+= stack_protector.c __error.c .if !defined(WITHOUT_SYSCALL_COMPAT) -SRCS+= ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +SRCS+= fcntl.c ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +PSEUDO+= _fcntl.o .endif # Add machine dependent asm sources: ==== //depot/projects/vap/lib/libc/sys/Symbol.map#6 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.13 2008/03/31 12:14:04 kib Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.14 2008/04/07 13:53:51 deischen Exp $ */ /* @@ -66,11 +66,6 @@ clock_settime; close; connect; - cpuset; - cpuset_getid; - cpuset_setid; - cpuset_getaffinity; - cpuset_setaffinity; dup; dup2; eaccess; @@ -335,6 +330,11 @@ }; FBSD_1.1 { + cpuset; + cpuset_getid; + cpuset_setid; + cpuset_getaffinity; + cpuset_setaffinity; faccessat; fchmodat; fchownat; ==== //depot/projects/vap/lib/libstand/nfs.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.12 2004/01/21 20:12:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.13 2008/04/05 15:03:29 dfr Exp $"); #include #include @@ -412,9 +412,16 @@ return (ENXIO); } + /* + * This is silly - we should look at dv_type but that value is + * arch dependant and we can't use it here. + */ #ifndef __i386__ if (strcmp(f->f_dev->dv_name, "net") != 0) return(EINVAL); +#else + if (strcmp(f->f_dev->dv_name, "pxe") != 0) + return(EINVAL); #endif if (!(desc = socktodesc(*(int *)(f->f_devdata)))) ==== //depot/projects/vap/libexec/rtld-elf/rtld.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.124 2007/05/17 18:00:27 csjp Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.125 2008/04/04 20:59:26 imp Exp $ */ /* @@ -773,12 +773,19 @@ obj->fini = (Elf_Addr) (obj->relocbase + dynp->d_un.d_ptr); break; + /* + * Don't process DT_DEBUG on MIPS as the dynamic section + * is mapped read-only. DT_MIPS_RLD_MAP is used instead. + */ + +#ifndef __mips__ case DT_DEBUG: /* XXX - not implemented yet */ if (!early) dbg("Filling in DT_DEBUG entry"); ((Elf_Dyn*)dynp)->d_un.d_ptr = (Elf_Addr) &r_debug; break; +#endif case DT_FLAGS: if (dynp->d_un.d_val & DF_ORIGIN) { @@ -795,6 +802,27 @@ if (dynp->d_un.d_val & DF_STATIC_TLS) ; break; +#ifdef __mips__ + case DT_MIPS_LOCAL_GOTNO: + obj->local_gotno = dynp->d_un.d_val; + break; + + case DT_MIPS_SYMTABNO: + obj->symtabno = dynp->d_un.d_val; + break; + + case DT_MIPS_GOTSYM: + obj->gotsym = dynp->d_un.d_val; + break; + + case DT_MIPS_RLD_MAP: +#ifdef notyet + if (!early) + dbg("Filling in DT_DEBUG entry"); + ((Elf_Dyn*)dynp)->d_un.d_ptr = (Elf_Addr) &r_debug; +#endif + break; +#endif default: if (!early) { @@ -1165,7 +1193,10 @@ objtmp.dynamic = rtld_dynamic(&objtmp); digest_dynamic(&objtmp, 1); assert(objtmp.needed == NULL); +#if !defined(__mips__) + /* MIPS and SH{3,5} have a bogus DT_TEXTREL. */ assert(!objtmp.textrel); +#endif /* * Temporarily put the dynamic linker entry into the object list, so @@ -2569,11 +2600,14 @@ continue; /* fallthrough */ case STT_TLS: - if (symp->st_shndx != SHN_UNDEF || - ((flags & SYMLOOK_IN_PLT) == 0 && - ELF_ST_TYPE(symp->st_info) == STT_FUNC)) + if (symp->st_shndx != SHN_UNDEF) + break; +#ifndef __mips__ + else if (((flags & SYMLOOK_IN_PLT) == 0) && + (ELF_ST_TYPE(symp->st_info) == STT_FUNC)) break; /* fallthrough */ +#endif default: continue; } @@ -2937,7 +2971,7 @@ #endif #if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \ - defined(__arm__) + defined(__arm__) || defined(__mips__) /* * Allocate Static TLS using the Variant II method. @@ -3103,7 +3137,7 @@ free_tls_offset(Obj_Entry *obj) { #if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \ - defined(__arm__) + defined(__arm__) || defined(__mips__) /* * If we were the last thing to allocate out of the static TLS * block, we give our space back to the 'allocator'. This is a ==== //depot/projects/vap/libexec/rtld-elf/rtld.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.38 2007/04/03 18:31:20 kan Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.39 2008/04/04 20:59:26 imp Exp $ */ #ifndef RTLD_H /* { */ @@ -178,6 +178,11 @@ const Elf_Sym *symtab; /* Symbol table */ const char *strtab; /* String table */ unsigned long strsize; /* Size in bytes of string table */ +#ifdef __mips__ + Elf_Word local_gotno; /* Number of local GOT entries */ + Elf_Word symtabno; /* Number of dynamic symbols */ + Elf_Word gotsym; /* First dynamic symbol in GOT */ +#endif const Elf_Verneed *verneed; /* Required versions. */ Elf_Word verneednum; /* Number of entries in verneed table */ ==== //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 (text+ko) ==== @@ -20,7 +20,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1083 2008/03/31 05:06:00 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1084 2008/04/05 18:11:39 bmah Exp $ 2000 @@ -165,7 +165,7 @@ kernel bug reports that are rich in debugging information, but are not dependent on kernel symbol tables or precisely synchronized source code. More information can be found in the - &man.textdump.4; manual page. + &man.textdump.4; manual page. &merged; Kernel support for M:N threading has been removed. While the KSE (Kernel Scheduled Entities) project was quite successful @@ -184,6 +184,10 @@ [&arch.amd64;] The &os; kernel now has support for large memory page mappings (superpages). + [&arch.amd64;, &arch.i386;, &arch.powerpc;] The ULE + scheduler is now the default process scheduler + in GENERIC kernels. &merged; + Boot Loader Changes @@ -205,11 +209,11 @@ Hardware Support The &man.cmx.4; driver, a driver for Omnikey CardMan 4040 - PCMCIA smartcard readers, has been added. + PCMCIA smartcard readers, has been added. &merged; The &man.uslcom.4; driver, a driver for Silicon Laboratories CP2101/CP2102-based USB serial adapters, has been - imported from OpenBSD. + imported from OpenBSD. &merged; Multimedia Support @@ -271,6 +275,9 @@ Disks and Storage + The &man.aac.4; driver now supports volumes larger than + 2TB in size. &merged; + The &man.ata.4; driver now supports a spindown command for disks; after a configurable amount of time, if no requests have been received for a disk, the disk will be spun down @@ -289,12 +296,21 @@ A problem with using &man.mmap.2; on ZFS filesystems has been fixed. + A new kernel-mode NFS lock manager has been added, + improving performance and behavior of NFS locking. A new + &man.clear.locks.8; command has been added to clear locks held + on behalf of an NFS client. + Userland Changes + The &man.adduser.8; utility now supports + a option to set the mode of a new user's + home directory. &merged; + BSD-licensed versions of &man.ar.1; and &man.ranlib.1;, based on libarchive, have replaced the GNU Binutils versions of these utilities. @@ -316,6 +332,13 @@ command to make it easier to debug crash dumps with kernel modules. + The &man.ls.1; program now supports a + option to specify a date format string to be used with the long + format () output. + + &man.nc.1; now supports a switch to + disable the use of TCP options. + The &man.procstat.1; utility has been added to display detailed information about processes. @@ -395,7 +418,11 @@ Ports/Packages Collection Infrastructure - + The pkg_sign and pkg_check utilities for cryptographically + signing &os; packages have been removed. They were only useful + for packages compressed using &man.gzip.1;; however + &man.bzip2.1; compression has been the norm for some time + now. ==== //depot/projects/vap/release/ia64/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.11 2005/01/30 21:10:52 kensmith Exp $ +# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.12 2008/04/08 02:57:59 marcel Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -67,7 +67,7 @@ # To create a bootable CD under EFI, the boot image should be an EFI # system partition. if [ $bootable = yes ]; then - EFISZ=32768 + EFISZ=40960 MNT=/mnt dd if=/dev/zero of=$BASE/$EFIPART count=$EFISZ md=`mdconfig -a -t vnode -f $BASE/$EFIPART` ==== //depot/projects/vap/sbin/ddb/ddb.8#3 (text+ko) ==== @@ -23,21 +23,21 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.3 2008/03/05 17:51:06 brooks Exp $ +.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.4 2008/04/04 07:31:43 ru Exp $ .\" -.Dd 25 December, 2007 +.Dd April 4, 2008 .Dt DDB 8 .Os .Sh NAME .Nm ddb -.Nd Configure DDB kernel debugger properties +.Nd "configure DDB kernel debugger properties" .Sh SYNOPSIS .Nm .Cm script .Ar scriptname .Nm .Cm script -.Ar scriptname=script +.Ar scriptname Ns = Ns Ar script .Nm .Cm scripts .Nm @@ -46,9 +46,10 @@ .Nm .Ar pathname .Sh DESCRIPTION +The .Nm -configures certain aspects of the -.Xr DDB 4 +utility configures certain aspects of the +.Xr ddb 4 kernel debugger from user space that are not configured at compile-time or easily via .Xr sysctl 8 @@ -64,24 +65,26 @@ .Nm utility. Whitespace at the beginning of lines will be ignored as will lines where the -first non-whitespace character is #. +first non-whitespace character is +.Ql # . .Sh SCRIPTING +The .Nm -can be used to configure aspects of -.Xr DDB 4 +utility can be used to configure aspects of +.Xr ddb 4 scripting from user space; scripting support is described in more detail in -.Xr DDB 4 . +.Xr ddb 4 . Each of the debugger commands is available from the command line: .Bl -tag -width indent .It Cm script Ar scriptname Print the script named .Ar scriptname . -.It Cm script Ar scriptname=scriptvalue +.It Cm script Ar scriptname Ns = Ns Ar script Define a script named -.Ar scriptname ; -as many scripts contain characters interpreted in special ways by the shell, +.Ar scriptname . +As many scripts contain characters interpreted in special ways by the shell, it is advisable to enclose -.Ar scriptvalue +.Ar script in quotes. .It Cm scripts List currently defined scripts. @@ -89,6 +92,8 @@ Delete the script named .Ar scriptname . .El +.Sh EXIT STATUS +.Ex -std .Sh EXAMPLES The following example defines a script that will execute when the kernel debugger is entered as a result of a break signal: @@ -97,24 +102,22 @@ .Ed .Pp The following example will delete the script: -.Bd -literal -offset indent -ddb unscript kdb.enter.break -.Ed +.Pp +.Dl "ddb unscript kdb.enter.break" .Pp For further examples, see the .Xr ddb 4 and .Xr textdump 4 -man pages. -.Sh EXIT STATUS -.Ex -std +manual pages. .Sh SEE ALSO .Xr ddb 4 , .Xr textdump 4 , .Xr sysctl 8 .Sh HISTORY +The .Nm -first appeared in +utility first appeared in .Fx 8.0 . .Sh AUTHORS .An Robert N M Watson ==== //depot/projects/vap/sbin/ddb/ddb.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.2 2008/03/05 17:51:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.3 2008/04/04 07:31:43 ru Exp $"); #include #include @@ -43,11 +43,11 @@ usage(void) { - fprintf(stderr, "usage:\n"); - fprintf(stderr, "ddb script scriptname\n"); - fprintf(stderr, "ddb script scriptname=script\n"); - fprintf(stderr, "ddb scripts\n"); - fprintf(stderr, "ddb unscript scriptname\n"); + fprintf(stderr, "usage: ddb script scriptname\n"); + fprintf(stderr, " ddb script scriptname=script\n"); + fprintf(stderr, " ddb scripts\n"); + fprintf(stderr, " ddb unscript scriptname\n"); + fprintf(stderr, " ddb pathname\n"); exit(EX_USAGE); } ==== //depot/projects/vap/sbin/fsck_ffs/main.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.49 2008/03/05 08:25:49 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.50 2008/04/04 01:50:58 rodrigc Exp $"); #include #include @@ -541,6 +541,10 @@ build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); build_iovec(&iov, &iovlen, "update", NULL, 0); + /* + * XX: We need the following line until we clean up + * nmount parsing of root mounts and NFS root mounts. + */ build_iovec(&iov, &iovlen, "ro", NULL, 0); if (nmount(iov, iovlen, fflags) == 0) { return (0); ==== //depot/projects/vap/sbin/gpt/gpt.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.19 2008/01/30 13:29:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.20 2008/04/07 18:23:28 jhb Exp $"); #include #include @@ -317,6 +317,13 @@ return (0); } break; + case 'z': + if (strcmp(s, "zfs") == 0) { + uuid_t zfs = GPT_ENT_TYPE_FREEBSD_ZFS; + *uuid = zfs; + return (0); + } + break; } return (EINVAL); } ==== //depot/projects/vap/share/man/man4/asmc.4#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2007 Rui Paulo +.\" Copyright (c) 2007, 2008 Rui Paulo .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,9 +23,9 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/asmc.4,v 1.3 2007/11/13 11:31:53 ru Exp $ +.\" $FreeBSD: src/share/man/man4/asmc.4,v 1.4 2008/04/07 11:27:16 rpaulo Exp $ .\" -.Dd November 10, 2007 +.Dd April 7, 2008 .Dt ASMC 4 .Os .Sh NAME @@ -121,7 +121,7 @@ the following way: .Bd -literal -offset indent notify 0 { - match "system" "ISA"; + match "system" "ACPI"; match "subsystem" "asmc"; action "/usr/local/sbin/ataidle -s X Y"; }; ==== //depot/projects/vap/share/man/man4/bpf.4#4 (text+ko) ==== @@ -47,7 +47,7 @@ .\" This document is derived in part from the enet man page (enet.4) .\" distributed with 4.3BSD Unix. .\" -.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.49 2008/03/24 13:49:17 csjp Exp $ +.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.50 2008/04/07 02:51:00 rwatson Exp $ .\" .Dd February 26, 2007 .Dt BPF 4 @@ -259,14 +259,14 @@ They will return a readable file descriptor when ownership of the next buffer is assigned to user space. .Pp -In the current implementation, the kernel will assign ownership of at most >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 8 19:13:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C4D31065673; Tue, 8 Apr 2008 19:13:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF86C106564A for ; Tue, 8 Apr 2008 19:13:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 950658FC26 for ; Tue, 8 Apr 2008 19:13:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m38JDbYd075787 for ; Tue, 8 Apr 2008 19:13:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m38JDbsT075785 for perforce@freebsd.org; Tue, 8 Apr 2008 19:13:37 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Apr 2008 19:13:37 GMT Message-Id: <200804081913.m38JDbsT075785@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 Cc: Subject: PERFORCE change 139609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 19:13:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=139609 Change 139609 by sam@sam_ebb on 2008/04/08 19:13:00 add support for wired interfaces; check the media to distinguish between 802.11 ifnets and others (assume anything !802.11 is wired) Affected files ... .. //depot/projects/vap/etc/rc.d/wpa_supplicant#3 edit Differences ... ==== //depot/projects/vap/etc/rc.d/wpa_supplicant#3 (text+ko) ==== @@ -25,7 +25,16 @@ driver="ndis" ;; *) - driver="bsd" + t="`ifconfig $1 2>/dev/null | grep media:`" + t=`expr "$t" : 'media: \([^ ]*\)'` + case "$t" in + Ethernet) + driver="wired" + ;; + *) + driver="bsd" + ;; + esac ;; esac From owner-p4-projects@FreeBSD.ORG Tue Apr 8 19:14:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 462E31065673; Tue, 8 Apr 2008 19:14:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04870106564A for ; Tue, 8 Apr 2008 19:14:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E73968FC1D for ; Tue, 8 Apr 2008 19:14:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m38JEcd6075813 for ; Tue, 8 Apr 2008 19:14:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m38JEcZ1075811 for perforce@freebsd.org; Tue, 8 Apr 2008 19:14:38 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Apr 2008 19:14:38 GMT Message-Id: <200804081914.m38JEcZ1075811@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 Cc: Subject: PERFORCE change 139610 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 19:14:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=139610 Change 139610 by sam@sam_ebb on 2008/04/08 19:14:37 o split wpa_supplicant config out into separate variables so people can run a version out of ports, stick the config file anywhere they want, and control logging o change default options to -s so we log to syslog (noop at boot until we fix the bogosity there) Affected files ... .. //depot/projects/vap/etc/defaults/rc.conf#8 edit .. //depot/projects/vap/etc/rc.d/wpa_supplicant#4 edit Differences ... ==== //depot/projects/vap/etc/defaults/rc.conf#8 (text+ko) ==== @@ -105,6 +105,10 @@ #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. +wpa_supplicant_program="/usr/sbin/wpa_supplicant" +wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant +wpa_supplicant_conf_file="/etc/wpa_supplicant.conf" +# firewall_enable="NO" # Set to YES to enable firewall functionality firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) ==== //depot/projects/vap/etc/rc.d/wpa_supplicant#4 (text+ko) ==== @@ -12,8 +12,6 @@ name="wpa_supplicant" rcvar= -command="/usr/sbin/${name}" -conf_file="/etc/wpa_supplicant.conf" ifn="$2" if [ -z "$ifn" ]; then @@ -40,8 +38,10 @@ load_rc_config $name -pid_file="/var/run/${name}/${ifn}.pid" -command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file" +command=${wpa_supplicant_program} +conf_file=${wpa_supplicant_conf_file} +pidfile="/var/run/${name}/${ifn}.pid" +command_args="-B ${wpa_supplicant_flags} -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file run_rc_command "$1" From owner-p4-projects@FreeBSD.ORG Tue Apr 8 19:35:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6783C106567B; Tue, 8 Apr 2008 19:35:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27C8A1065676 for ; Tue, 8 Apr 2008 19:35:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 16A578FC1D for ; Tue, 8 Apr 2008 19:35:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m38JZ1XK076603 for ; Tue, 8 Apr 2008 19:35:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m38JZ0e3076579 for perforce@freebsd.org; Tue, 8 Apr 2008 19:35:00 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Apr 2008 19:35:00 GMT Message-Id: <200804081935.m38JZ0e3076579@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 Cc: Subject: PERFORCE change 139611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 19:35:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=139611 Change 139611 by sam@sam_ebb on 2008/04/08 19:34:22 grep is in /usr/bin; do it entirely in the shell (with help from the peanut gallery) Affected files ... .. //depot/projects/vap/etc/rc.d/wpa_supplicant#5 edit Differences ... ==== //depot/projects/vap/etc/rc.d/wpa_supplicant#5 (text+ko) ==== @@ -18,21 +18,29 @@ return 1 fi +is_wired_interface() +{ + media= + ifconfig $1 2>/dev/null | while read line; do + case "$line" in + *media:*Ethernet*) + media="Ethernet" + ;; + esac + done + test -z "$media" +} + case ${ifn} in ndis*) driver="ndis" ;; *) - t="`ifconfig $1 2>/dev/null | grep media:`" - t=`expr "$t" : 'media: \([^ ]*\)'` - case "$t" in - Ethernet) + if is_wired_interface ${ifn} ; then driver="wired" - ;; - *) + else driver="bsd" - ;; - esac + fi ;; esac From owner-p4-projects@FreeBSD.ORG Tue Apr 8 20:43:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34B71106567C; Tue, 8 Apr 2008 20:43:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0700106564A for ; Tue, 8 Apr 2008 20:43:17 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BEF0E8FC27 for ; Tue, 8 Apr 2008 20:43:17 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m38KhHBI081646 for ; Tue, 8 Apr 2008 20:43:17 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m38KhHob081644 for perforce@freebsd.org; Tue, 8 Apr 2008 20:43:17 GMT (envelope-from rrs@cisco.com) Date: Tue, 8 Apr 2008 20:43:17 GMT Message-Id: <200804082043.m38KhHob081644@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 139614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 20:43:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=139614 Change 139614 by rrs@rrs-mips2-jnpr on 2008/04/08 20:43:00 Adds a bsd liscense (there was none before) Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/cpuinfo_octeon.h#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/cpuinfo_octeon.h#2 (text+ko) ==== @@ -1,5 +1,45 @@ #ifndef __CPUINFO_OCTEON_H_ #define __CPUINFO_OCTEON_H_ +/* +Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights +reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Cavium Networks nor the names of + its contributors may be used to endorse or promote products + derived from this software without specific prior written + permission. + +This Software, including technical data, may be subject to U.S. export +control laws, including the U.S. Export Administration Act and its +associated regulations, and may be subject to export or import +regulations in other countries. You warrant that You will comply +strictly in all respects with all such regulations and acknowledge that +you have the responsibility to obtain licenses to export, re-export or +import the Software. + +TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" +AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS +OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT +TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY +REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT +DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF +TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, +LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION +OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR +PERFORMANCE OF THE SOFTWARE LIES WITH YOU. +*/ /* Assigned Company values for bits 23:16 of the PRId Register From owner-p4-projects@FreeBSD.ORG Tue Apr 8 20:44:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 521C81065671; Tue, 8 Apr 2008 20:44:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 139FC106564A for ; Tue, 8 Apr 2008 20:44:19 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 021168FC16 for ; Tue, 8 Apr 2008 20:44:19 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m38KiIGa081691 for ; Tue, 8 Apr 2008 20:44:18 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m38KiI0Z081689 for perforce@freebsd.org; Tue, 8 Apr 2008 20:44:18 GMT (envelope-from rrs@cisco.com) Date: Tue, 8 Apr 2008 20:44:18 GMT Message-Id: <200804082044.m38KiI0Z081689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 139615 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 20:44:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=139615 Change 139615 by rrs@rrs-mips2-jnpr on 2008/04/08 20:43:29 Adds BSD license (there was none before) Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_pcmap_regs.h#8 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_pcmap_regs.h#8 (text+ko) ==== @@ -1,5 +1,45 @@ #ifndef __OCTEON_PCMAP_REGS_H__ #define __OCTEON_PCMAP_REGS_H__ +/* +Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights +reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Cavium Networks nor the names of + its contributors may be used to endorse or promote products + derived from this software without specific prior written + permission. + +This Software, including technical data, may be subject to U.S. export +control laws, including the U.S. Export Administration Act and its +associated regulations, and may be subject to export or import +regulations in other countries. You warrant that You will comply +strictly in all respects with all such regulations and acknowledge that +you have the responsibility to obtain licenses to export, re-export or +import the Software. + +TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" +AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS +OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT +TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY +REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT +DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF +TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, +LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION +OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR +PERFORMANCE OF THE SOFTWARE LIES WITH YOU. +*/ #define OCTEON_CACHE_LINE_SIZE 0x80 /* 128 bytes cache line size */ From owner-p4-projects@FreeBSD.ORG Tue Apr 8 20:57:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AF641065675; Tue, 8 Apr 2008 20:57:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CA871065671; Tue, 8 Apr 2008 20:57:15 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id E2E748FC1A; Tue, 8 Apr 2008 20:57:14 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id m38KsYCi059707; Tue, 8 Apr 2008 14:54:34 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Tue, 08 Apr 2008 14:55:28 -0600 (MDT) Message-Id: <20080408.145528.1220015476.imp@bsdimp.com> To: rrs@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <200804082044.m38KiI0Z081689@repoman.freebsd.org> References: <200804082044.m38KiI0Z081689@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@FreeBSD.org Subject: Re: PERFORCE change 139615 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 20:57:15 -0000 In message: <200804082044.m38KiI0Z081689@repoman.freebsd.org> "Randall R. Stewart" writes: : http://perforce.freebsd.org/chv.cgi?CH=139615 : : Change 139615 by rrs@rrs-mips2-jnpr on 2008/04/08 20:43:29 : : Adds BSD license (there was none before) This isn't exactly your standard BSD license... The export control stuff is a CYA from Cavium for their crypto bits, I think... Warner : Affected files ... : : .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_pcmap_regs.h#8 edit : : Differences ... : : ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_pcmap_regs.h#8 (text+ko) ==== : : @@ -1,5 +1,45 @@ : #ifndef __OCTEON_PCMAP_REGS_H__ : #define __OCTEON_PCMAP_REGS_H__ : +/* : +Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights : +reserved. : + : +Redistribution and use in source and binary forms, with or without : +modification, are permitted provided that the following conditions are : +met: : + : + * Redistributions of source code must retain the above copyright : + notice, this list of conditions and the following disclaimer. : + : + * Redistributions in binary form must reproduce the above : + copyright notice, this list of conditions and the following : + disclaimer in the documentation and/or other materials provided : + with the distribution. : + : + * Neither the name of Cavium Networks nor the names of : + its contributors may be used to endorse or promote products : + derived from this software without specific prior written : + permission. : + : +This Software, including technical data, may be subject to U.S. export : +control laws, including the U.S. Export Administration Act and its : +associated regulations, and may be subject to export or import : +regulations in other countries. You warrant that You will comply : +strictly in all respects with all such regulations and acknowledge that : +you have the responsibility to obtain licenses to export, re-export or : +import the Software. : + : +TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" : +AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS : +OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT : +TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY : +REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT : +DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF : +TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, : +LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION : +OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR : +PERFORMANCE OF THE SOFTWARE LIES WITH YOU. : +*/ : : : #define OCTEON_CACHE_LINE_SIZE 0x80 /* 128 bytes cache line size */ : From owner-p4-projects@FreeBSD.ORG Tue Apr 8 21:28:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BCB71065671; Tue, 8 Apr 2008 21:28:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CFC4106566B for ; Tue, 8 Apr 2008 21:28:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2961C8FC1A for ; Tue, 8 Apr 2008 21:28:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m38LS81Q098539 for ; Tue, 8 Apr 2008 21:28:08 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m38LS6eB098537 for perforce@freebsd.org; Tue, 8 Apr 2008 21:28:06 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Apr 2008 21:28:06 GMT Message-Id: <200804082128.m38LS6eB098537@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 Cc: Subject: PERFORCE change 139617 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 21:28:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=139617 Change 139617 by sam@sam_ebb on 2008/04/08 21:27:55 IFC @ 139613 Affected files ... .. //depot/projects/qingli_mpath/src/Makefile#4 integrate .. //depot/projects/qingli_mpath/src/Makefile.inc1#3 integrate .. //depot/projects/qingli_mpath/src/ObsoleteFiles.inc#4 integrate .. //depot/projects/qingli_mpath/src/UPDATING#3 integrate .. //depot/projects/qingli_mpath/src/bin/ls/ls.1#2 integrate .. //depot/projects/qingli_mpath/src/bin/ls/ls.c#2 integrate .. //depot/projects/qingli_mpath/src/bin/ls/ls.h#2 integrate .. //depot/projects/qingli_mpath/src/bin/ls/print.c#2 integrate .. //depot/projects/qingli_mpath/src/bin/ls/util.c#2 integrate .. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/alloca.h#2 integrate .. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/fcntl.h#2 integrate .. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/fsshare.h#2 integrate .. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/stdio.h#2 integrate .. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/stdlib.h#2 integrate .. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/strings.h#2 integrate .. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/unistd.h#2 integrate .. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/fsshare.c#2 integrate .. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/mnttab.c#2 integrate .. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/zone.c#2 integrate .. //depot/projects/qingli_mpath/src/cddl/lib/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/contrib/netcat/nc.1#2 integrate .. //depot/projects/qingli_mpath/src/contrib/netcat/netcat.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/pf/pfctl/pfctl_altq.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/pf/pfctl/pfctl_qstats.c#2 integrate .. //depot/projects/qingli_mpath/src/etc/network.subr#2 integrate .. //depot/projects/qingli_mpath/src/etc/rc.d/ppp#4 integrate .. //depot/projects/qingli_mpath/src/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/qingli_mpath/src/etc/rc.d/zfs#3 integrate .. //depot/projects/qingli_mpath/src/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/qingli_mpath/src/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/qingli_mpath/src/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/qingli_mpath/src/include/complex.h#2 integrate .. //depot/projects/qingli_mpath/src/include/stdio.h#3 integrate .. //depot/projects/qingli_mpath/src/include/unistd.h#3 integrate .. //depot/projects/qingli_mpath/src/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/qingli_mpath/src/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/qingli_mpath/src/lib/libc/gen/err.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libc/gen/modf.3#2 integrate .. //depot/projects/qingli_mpath/src/lib/libc/gen/msgctl.3#2 integrate .. //depot/projects/qingli_mpath/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/qingli_mpath/src/lib/libc/include/namespace.h#4 integrate .. //depot/projects/qingli_mpath/src/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/qingli_mpath/src/lib/libc/rpc/svc_vc.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/qingli_mpath/src/lib/libc/sys/Symbol.map#4 integrate .. //depot/projects/qingli_mpath/src/lib/libc/sys/aio_cancel.2#2 integrate .. //depot/projects/qingli_mpath/src/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/qingli_mpath/src/lib/libc/sys/cpuset.2#1 branch .. //depot/projects/qingli_mpath/src/lib/libc/sys/cpuset_getaffinity.2#1 branch .. //depot/projects/qingli_mpath/src/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/qingli_mpath/src/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/qingli_mpath/src/lib/libc/xdr/xdr_rec.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libstand/nfs.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/Makefile#4 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/arch/amd64/Makefile.inc#3 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/qingli_mpath/src/lib/libthr/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/arch/i386/Makefile.inc#3 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/qingli_mpath/src/lib/libthr/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_affinity.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_cond.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_rtld.c#3 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_rwlock.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/qingli_mpath/src/lib/msun/Makefile#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/Symbol.map#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/amd64/e_remainderl.S#1 branch .. //depot/projects/qingli_mpath/src/lib/msun/amd64/s_remquol.S#1 branch .. //depot/projects/qingli_mpath/src/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/i387/e_remainderl.S#1 branch .. //depot/projects/qingli_mpath/src/lib/msun/i387/s_remquol.S#1 branch .. //depot/projects/qingli_mpath/src/lib/msun/man/csqrt.3#2 integrate .. //depot/projects/qingli_mpath/src/lib/msun/man/hypot.3#2 integrate .. //depot/projects/qingli_mpath/src/lib/msun/man/remainder.3#2 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/e_hypot.c#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/e_hypotf.c#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/e_hypotl.c#1 branch .. //depot/projects/qingli_mpath/src/lib/msun/src/e_log.c#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/e_logf.c#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/e_remainder.c#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/e_remainderl.c#1 branch .. //depot/projects/qingli_mpath/src/lib/msun/src/math.h#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/s_csqrtl.c#1 branch .. //depot/projects/qingli_mpath/src/lib/msun/src/s_expm1.c#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/s_expm1f.c#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/s_fma.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/s_fmaf.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/s_fmal.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/s_log1p.c#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/s_log1pf.c#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/s_remquo.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/s_remquol.c#1 branch .. //depot/projects/qingli_mpath/src/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/qingli_mpath/src/lib/msun/src/w_cabsl.c#1 branch .. //depot/projects/qingli_mpath/src/libexec/rtld-elf/mips/reloc.c#1 branch .. //depot/projects/qingli_mpath/src/libexec/rtld-elf/mips/rtld_machdep.h#1 branch .. //depot/projects/qingli_mpath/src/libexec/rtld-elf/mips/rtld_start.S#1 branch .. //depot/projects/qingli_mpath/src/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/qingli_mpath/src/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/qingli_mpath/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/qingli_mpath/src/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/qingli_mpath/src/rescue/rescue/Makefile#3 integrate .. //depot/projects/qingli_mpath/src/sbin/ddb/ddb.8#3 integrate .. //depot/projects/qingli_mpath/src/sbin/ddb/ddb.c#3 integrate .. //depot/projects/qingli_mpath/src/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/qingli_mpath/src/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/qingli_mpath/src/sbin/ggate/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/sbin/gpt/gpt.c#3 integrate .. //depot/projects/qingli_mpath/src/sbin/ifconfig/ifclone.c#2 integrate .. //depot/projects/qingli_mpath/src/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/qingli_mpath/src/sbin/ifconfig/ifconfig.h#2 integrate .. //depot/projects/qingli_mpath/src/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/qingli_mpath/src/sbin/restore/dirs.c#2 integrate .. //depot/projects/qingli_mpath/src/sbin/restore/interactive.c#2 integrate .. //depot/projects/qingli_mpath/src/share/man/man3/Makefile#3 integrate .. //depot/projects/qingli_mpath/src/share/man/man4/Makefile#3 integrate .. //depot/projects/qingli_mpath/src/share/man/man4/arcmsr.4#2 integrate .. //depot/projects/qingli_mpath/src/share/man/man4/asmc.4#2 integrate .. //depot/projects/qingli_mpath/src/share/man/man4/bpf.4#3 integrate .. //depot/projects/qingli_mpath/src/share/man/man4/ng_pptpgre.4#2 integrate .. //depot/projects/qingli_mpath/src/share/man/man4/psm.4#2 integrate .. //depot/projects/qingli_mpath/src/share/man/man4/ubsa.4#2 integrate .. //depot/projects/qingli_mpath/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/qingli_mpath/src/share/man/man5/src.conf.5#2 integrate .. //depot/projects/qingli_mpath/src/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/qingli_mpath/src/share/man/man9/Makefile#3 integrate .. //depot/projects/qingli_mpath/src/share/man/man9/lock.9#3 integrate .. //depot/projects/qingli_mpath/src/share/man/man9/rwlock.9#3 integrate .. //depot/projects/qingli_mpath/src/share/man/man9/sleep.9#2 integrate .. //depot/projects/qingli_mpath/src/share/mk/bsd.own.mk#3 integrate .. //depot/projects/qingli_mpath/src/share/mk/sys.mk#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/qingli_mpath/src/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/qingli_mpath/src/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/arm/arm/exception.S#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/arm/intr.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/arm/arm/locore.S#3 integrate .. //depot/projects/qingli_mpath/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/include/machdep.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/machine/endian.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/cyclic.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/debug.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/dirent.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/elf.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/kobj.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/kstat.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/lock.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mman.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mnttab.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/modctl.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mount.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/param.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/pcpu.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/random.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/sdt.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/stat.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/systm.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/varargs.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 integrate .. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/qingli_mpath/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/conf/Makefile.arm#3 integrate .. //depot/projects/qingli_mpath/src/sys/conf/NOTES#5 integrate .. //depot/projects/qingli_mpath/src/sys/conf/files#6 integrate .. //depot/projects/qingli_mpath/src/sys/conf/options#5 integrate .. //depot/projects/qingli_mpath/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/qingli_mpath/src/sys/dev/aac/aac_disk.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/de/if_de.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_82540.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_82541.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_82542.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_82543.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_82571.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_82571.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_api.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_api.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_defines.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_hw.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_mac.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_mac.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_manage.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_phy.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_phy.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/em/if_em.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/mii/miidevs#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/re/if_re.c#5 integrate .. //depot/projects/qingli_mpath/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/qingli_mpath/src/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/geom/geom_subr.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_pc98.c#1 branch .. //depot/projects/qingli_mpath/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/qingli_mpath/src/sys/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/i386/linux/linux.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/qingli_mpath/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/ia64/include/md_var.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_lockf.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/systrace_args.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_acl.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/modules/Makefile#4 integrate .. //depot/projects/qingli_mpath/src/sys/modules/asmc/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/sys/modules/em/Makefile#4 integrate .. //depot/projects/qingli_mpath/src/sys/modules/geom/geom_part/Makefile#3 integrate .. //depot/projects/qingli_mpath/src/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch .. //depot/projects/qingli_mpath/src/sys/modules/igb/Makefile#3 integrate .. //depot/projects/qingli_mpath/src/sys/net/bpf.c#5 integrate .. //depot/projects/qingli_mpath/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/net/if_loop.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/netgraph/ng_car.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/netinet/tcp.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_clnt.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_svc.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_xdr.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/nlm/sm_inter_xdr.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/pc98/cbus/sc_machdep.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/pc98/cbus/syscons_cbus.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/qingli_mpath/src/sys/powerpc/include/asm.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/powerpc/include/atomic.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/auth_unix.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/clnt_rc.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/inet_ntop.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/inet_pton.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/rpc_generic.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/svc.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/svc_auth_unix.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/svc_dg.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/svc_generic.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/_lockmgr.h#1 branch .. //depot/projects/qingli_mpath/src/sys/sys/_stack.h#1 branch .. //depot/projects/qingli_mpath/src/sys/sys/aac_ioctl.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/buf.h#5 integrate .. //depot/projects/qingli_mpath/src/sys/sys/callout.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sys/cpuset.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/eventhandler.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/fcntl.h#4 integrate .. //depot/projects/qingli_mpath/src/sys/sys/imgact.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sys/interrupt.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/kernel.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/lockmgr.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/mman.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sys/namei.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sys/param.h#5 integrate .. //depot/projects/qingli_mpath/src/sys/sys/proc.h#4 integrate .. //depot/projects/qingli_mpath/src/sys/sys/rwlock.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/stack.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sys/stat.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sys/syscall.h#4 integrate .. //depot/projects/qingli_mpath/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/qingli_mpath/src/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/qingli_mpath/src/sys/sys/time.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/umtx.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sys/vnode.h#4 integrate .. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/vm/uma.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/vm/vm_kern.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/vm/vm_phys.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/qingli_mpath/src/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate .. //depot/projects/qingli_mpath/src/tools/build/options/WITHOUT_LIBKSE#2 delete .. //depot/projects/qingli_mpath/src/tools/regression/lib/msun/Makefile#3 integrate .. //depot/projects/qingli_mpath/src/tools/regression/lib/msun/test-csqrt.c#2 integrate .. //depot/projects/qingli_mpath/src/tools/regression/lib/msun/test-fma.c#1 branch .. //depot/projects/qingli_mpath/src/tools/regression/lib/msun/test-fma.t#1 branch .. //depot/projects/qingli_mpath/src/tools/regression/lib/msun/test-rem.c#2 integrate .. //depot/projects/qingli_mpath/src/tools/tools/README#3 integrate .. //depot/projects/qingli_mpath/src/tools/tools/mctest/Makefile#1 branch .. //depot/projects/qingli_mpath/src/tools/tools/mctest/mctest.1#1 branch .. //depot/projects/qingli_mpath/src/tools/tools/mctest/mctest.cc#2 integrate .. //depot/projects/qingli_mpath/src/tools/tools/mctest/mctest.h#2 integrate .. //depot/projects/qingli_mpath/src/usr.bin/Makefile#3 integrate .. //depot/projects/qingli_mpath/src/usr.bin/gprof/gprof.h#2 integrate .. //depot/projects/qingli_mpath/src/usr.bin/kdump/kdump.1#3 integrate .. //depot/projects/qingli_mpath/src/usr.bin/kdump/kdump.c#3 integrate .. //depot/projects/qingli_mpath/src/usr.bin/ktrace/ktrace.1#3 integrate .. //depot/projects/qingli_mpath/src/usr.bin/ktrace/ktrace.c#3 integrate .. //depot/projects/qingli_mpath/src/usr.bin/xlint/lint1/param.h#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/Makefile#4 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/amd/amd/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/clear_locks/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/fifolog/fifolog_reader/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/ngctl/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/Makefile#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/README#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/check.c#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/common.c#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/extern.h#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/gzip.c#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/gzip.h#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/main.c#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/pgp.h#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/pgp_check.c#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/pgp_sign.c#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/pkg_sign.1#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/sha1.c#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/sign.c#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/stand.c#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/stand.h#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/x509.c#2 delete .. //depot/projects/qingli_mpath/src/usr.sbin/rpc.lockd/lockd.c#3 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/rpc.statd/statd.c#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/sysinstall/devices.c#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/sysinstall/menus.c#3 integrate Differences ... ==== //depot/projects/qingli_mpath/src/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $ +# $FreeBSD: src/Makefile,v 1.347 2008/03/31 13:32:55 pav Exp $ # # The user-driven targets are: # @@ -36,7 +36,7 @@ # The user-driven targets (as listed above) are implemented in Makefile.inc1. # # If you want to build your system from source be sure that /usr/obj has -# at least 400MB of diskspace available. +# at least 800MB of diskspace available. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: ==== //depot/projects/qingli_mpath/src/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1039,18 +1039,14 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam ${_default_thread_lib} \ + lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} -.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" -_default_thread_lib= lib/${DEFAULT_THREAD_LIB} -.elif ${MK_LIBTHR} != "no" -_default_thread_lib= lib/libthr -.elif ${MK_LIBKSE} != "no" -_default_thread_lib= lib/libkse +.if ${MK_LIBTHR} != "no" +_lib_libthr= lib/libthr .endif _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ==== //depot/projects/qingli_mpath/src/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080331: pkg_sign has been removed +OLD_FILES+=usr/sbin/pkg_check +OLD_FILES+=usr/sbin/pkg_sign +OLD_FILES+=usr/share/man/man1/pkg_check.1.gz +OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz # 20080220: geom_lvm rename to geom_linux_lvm OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal @@ -30,7 +35,6 @@ # 20071201: Removal of XRPU driver OLD_FILES+=usr/include/sys/xrpuio.h # 20071129: Disabled static versions of libkse by default -.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a @@ -39,7 +43,6 @@ OLD_FILES+=usr/lib32/libkse_p.a OLD_FILES+=usr/lib32/libkse_pic.a .endif -.endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h # 20071125: Renamed to pmc_get_msr() ==== //depot/projects/qingli_mpath/src/UPDATING#3 (text+ko) ==== @@ -22,6 +22,13 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080408: + psm(4) has gained write(2) support in native operation level. + Arbitrary commands can be written to /dev/psm%d and status can + be read back from it. Therefore, an application is responsible + for status validation and error recovery. It is a no-op in + other operation levels. + 20080312: Support for KSE threading has been removed from the kernel. To run legacy applications linked against KSE libmap.conf may @@ -1007,4 +1014,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ +$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $ ==== //depot/projects/qingli_mpath/src/bin/ls/ls.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $ .\" -.Dd October 12, 2006 +.Dd April 4, 2008 .Dt LS 1 .Os .Sh NAME @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1 +.Op Fl D Ar format .Op Ar .Sh DESCRIPTION For each operand that names a @@ -88,6 +89,21 @@ is the numeric value of the character in octal. .It Fl C Force multi-column output; this is the default when output is to a terminal. +.It Fl D Ar format +When printing in the long +.Pq Fl l +format, use +.Ar format +to format the date and time output. +The argument +.Ar format +is a string used by +.Xr strftime 3 . +Depending on the choice of format string, this may result in a +different number of columns in the output. +This option overrides the +.Fl T +option. .It Fl F Display a slash .Pq Ql / @@ -146,12 +162,13 @@ Sort by size (largest file first) before sorting the operands in lexicographical order. .It Fl T -When used with the -.Fl l -(lowercase letter -.Dq ell ) -option, display complete time information for the file, including +When printing in the long +.Pq Fl l +format, display complete time information for the file, including month, day, hour, minute, second, and year. +The +.Fl D +option gives even more control over the output format. .It Fl U Use time when file was created for sorting or printing. .It Fl W @@ -325,7 +342,12 @@ modified, and the pathname. .Pp If the modification time of the file is more than 6 months -in the past or future, then the year of the last modification +in the past or future, and the +.Fl D +or +.Fl T +are not specified, +then the year of the last modification is displayed in place of the hour and minute fields. .Pp If the owner or group names are not a known user or group name, @@ -657,6 +679,7 @@ .Xr getfacl 1 , .Xr sort 1 , .Xr xterm 1 , +.Xr strftime 3 , .Xr termcap 5 , .Xr maclabel 7 , .Xr symlink 7 , ==== //depot/projects/qingli_mpath/src/bin/ls/ls.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $"); #include #include @@ -125,10 +125,11 @@ static int f_singlecol; /* use single column output */ int f_size; /* list size in short listing */ int f_slash; /* similar to f_type, but only for dirs */ - int f_sortacross; /* sort across rows, not down columns */ + int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ + char *f_timeformat; /* user-specified time format */ static int f_sizesort; int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -179,7 +180,7 @@ fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCD:FGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -198,6 +199,9 @@ case 'C': f_sortacross = f_longform = f_singlecol = 0; break; + case 'D': + f_timeformat = optarg; + break; case 'l': f_longform = 1; f_singlecol = 0; ==== //depot/projects/qingli_mpath/src/bin/ls/ls.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $ */ #define NO_PRINT 1 @@ -50,8 +50,9 @@ extern int f_sectime; /* print the real time for all files */ extern int f_size; /* list size in short listing */ extern int f_slash; /* append a '/' if the file is a directory */ -extern int f_sortacross; /* sort across rows, not down columns */ +extern int f_sortacross; /* sort across rows, not down columns */ extern int f_statustime; /* use time of last mode change */ +extern char *f_timeformat; /* user-specified time format */ extern int f_notabs; /* don't use tab-separated multi-col output */ extern int f_type; /* add type character for non-regular files */ #ifdef COLORLS ==== //depot/projects/qingli_mpath/src/bin/ls/print.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $"); #include #include @@ -237,7 +237,7 @@ if (chcnt) putchar('\n'); } - + void printcol(const DISPLAY *dp) { @@ -378,17 +378,20 @@ now = time(NULL); #define SIXMONTHS ((365 / 2) * 86400) - if (f_sectime) + if (f_timeformat) /* user specified format */ + format = f_timeformat; + else if (f_sectime) /* mmm dd hh:mm:ss yyyy || dd mmm hh:mm:ss yyyy */ - format = d_first ? "%e %b %T %Y " : "%b %e %T %Y "; + format = d_first ? "%e %b %T %Y" : "%b %e %T %Y"; else if (ftime + SIXMONTHS > now && ftime < now + SIXMONTHS) /* mmm dd hh:mm || dd mmm hh:mm */ - format = d_first ? "%e %b %R " : "%b %e %R "; + format = d_first ? "%e %b %R" : "%b %e %R"; else /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y " : "%b %e %Y "; + format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); + fputc(' ', stdout); } static int @@ -625,7 +628,7 @@ snprintf(name, sizeof(name), "%s", p->fts_name); else snprintf(name, sizeof(name), "%s/%s", - p->fts_parent->fts_accpath, p->fts_name); + p->fts_parent->fts_accpath, p->fts_name); /* * We have no way to tell whether a symbolic link has an ACL since * pathconf() and acl_get_file() both follow them. They also don't ==== //depot/projects/qingli_mpath/src/bin/ls/util.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.40 2006/03/24 16:38:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.41 2008/04/04 05:55:42 ru Exp $"); #include #include @@ -222,9 +222,9 @@ { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #else - "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #endif " [file ...]\n"); exit(1); ==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/alloca.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/cddl/compat/opensolaris/include/alloca.h,v 1.1 2007/11/28 21:40:07 jb Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/include/alloca.h,v 1.2 2008/03/28 22:16:04 jb Exp $ * */ ==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/fcntl.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/cddl/compat/opensolaris/include/fcntl.h,v 1.1 2007/11/28 21:40:07 jb Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/include/fcntl.h,v 1.2 2008/03/28 22:16:04 jb Exp $ * */ ==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/fsshare.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/cddl/compat/opensolaris/include/fsshare.h,v 1.1 2007/04/06 01:08:58 pjd Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/include/fsshare.h,v 1.2 2008/03/28 22:16:04 jb Exp $ */ #ifndef _OPENSOLARIS_FSSHARE_H_ ==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/stdio.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/cddl/compat/opensolaris/include/stdio.h,v 1.1 2007/11/28 21:40:07 jb Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/include/stdio.h,v 1.2 2008/03/28 22:16:04 jb Exp $ * */ ==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/stdlib.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/cddl/compat/opensolaris/include/stdlib.h,v 1.1 2007/11/28 21:40:07 jb Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/include/stdlib.h,v 1.2 2008/03/28 22:16:04 jb Exp $ * */ ==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/strings.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/cddl/compat/opensolaris/include/strings.h,v 1.1 2007/11/28 21:40:07 jb Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/include/strings.h,v 1.2 2008/03/28 22:16:04 jb Exp $ * */ ==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/unistd.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/cddl/compat/opensolaris/include/unistd.h,v 1.1 2007/11/28 21:40:07 jb Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/include/unistd.h,v 1.2 2008/03/28 22:16:04 jb Exp $ * */ ==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/deviceid.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/deviceid.c,v 1.1 2007/05/06 01:39:38 pjd Exp $"); +__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/deviceid.c,v 1.2 2008/03/28 22:16:05 jb Exp $"); #include #include ==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/fsshare.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.2 2007/04/21 13:17:23 pjd Exp $"); +__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.3 2008/03/28 22:16:05 jb Exp $"); #include #include ==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/mnttab.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.1 2007/04/06 01:08:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.2 2008/03/28 22:16:05 jb Exp $"); #include #include ==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/zmount.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.1 2007/04/06 01:08:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.2 2008/03/28 22:16:05 jb Exp $"); #include #include ==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/zone.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/cddl/compat/opensolaris/misc/zone.c,v 1.1 2007/04/06 01:08:59 pjd Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/misc/zone.c,v 1.2 2008/03/28 22:16:05 jb Exp $ */ #include ==== //depot/projects/qingli_mpath/src/cddl/lib/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $ .include @@ -11,7 +11,7 @@ .if ${MK_ZFS} != "no" _libzfs= libzfs -.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" +.if ${MK_LIBTHR} != "no" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 8 22:18:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 787CC1065678; Tue, 8 Apr 2008 22:18:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37729106564A for ; Tue, 8 Apr 2008 22:18:28 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 237E38FC1A for ; Tue, 8 Apr 2008 22:18:28 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m38MISAd001549 for ; Tue, 8 Apr 2008 22:18:28 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m38MI3h8001530 for perforce@freebsd.org; Tue, 8 Apr 2008 22:18:03 GMT (envelope-from julian@freebsd.org) Date: Tue, 8 Apr 2008 22:18:03 GMT Message-Id: <200804082218.m38MI3h8001530@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 139620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 22:18:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=139620 Change 139620 by julian@julian_trafmon1 on 2008/04/08 22:18:02 IFC @ 139613 Affected files ... .. //depot/projects/arp-v2/src/LOCKS#2 integrate .. //depot/projects/arp-v2/src/MAINTAINERS#2 integrate .. //depot/projects/arp-v2/src/Makefile#3 integrate .. //depot/projects/arp-v2/src/Makefile.inc1#2 integrate .. //depot/projects/arp-v2/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/arp-v2/src/UPDATING#2 integrate .. //depot/projects/arp-v2/src/bin/Makefile#2 integrate .. //depot/projects/arp-v2/src/bin/chflags/chflags.1#2 integrate .. //depot/projects/arp-v2/src/bin/chflags/chflags.c#2 integrate .. //depot/projects/arp-v2/src/bin/cp/cp.1#2 integrate .. //depot/projects/arp-v2/src/bin/cp/cp.c#3 integrate .. //depot/projects/arp-v2/src/bin/cp/utils.c#2 integrate .. //depot/projects/arp-v2/src/bin/date/date.c#2 integrate .. //depot/projects/arp-v2/src/bin/ls/ls.1#2 integrate .. //depot/projects/arp-v2/src/bin/ls/ls.c#2 integrate .. //depot/projects/arp-v2/src/bin/ls/ls.h#2 integrate .. //depot/projects/arp-v2/src/bin/ls/print.c#2 integrate .. //depot/projects/arp-v2/src/bin/ls/util.c#2 integrate .. //depot/projects/arp-v2/src/bin/ps/ps.1#2 integrate .. //depot/projects/arp-v2/src/bin/realpath/realpath.1#2 integrate .. //depot/projects/arp-v2/src/bin/realpath/realpath.c#2 integrate .. //depot/projects/arp-v2/src/bin/sh/cd.c#2 integrate .. //depot/projects/arp-v2/src/bin/sh/mksyntax.c#2 integrate .. //depot/projects/arp-v2/src/bin/sh/options.c#2 integrate .. //depot/projects/arp-v2/src/bin/uuidgen/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/arp-v2/src/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/arp-v2/src/cddl/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/arp-v2/src/cddl/lib/Makefile#2 integrate .. //depot/projects/arp-v2/src/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/arp-v2/src/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/arp-v2/src/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/arp-v2/src/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/arp-v2/src/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/arp-v2/src/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/arp-v2/src/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/arp-v2/src/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/arp-v2/src/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/arp-v2/src/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/arp-v2/src/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/arp-v2/src/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/arp-v2/src/compat/opensolaris/include/alloca.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/include/devid.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/include/fcntl.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/include/fsshare.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/include/libintl.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/include/mnttab.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/include/priv.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/include/solaris.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/include/stdio.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/include/stdlib.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/include/strings.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/include/unistd.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/include/zone.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/lib/libumem/umem.c#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/lib/libumem/umem.h#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/misc/deviceid.c#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/misc/fsshare.c#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/misc/mkdirp.c#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/misc/mnttab.c#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/misc/zmount.c#2 delete .. //depot/projects/arp-v2/src/compat/opensolaris/misc/zone.c#2 delete .. //depot/projects/arp-v2/src/contrib/binutils/libiberty/cp-demangle.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/FREEBSD-vendor#1 branch .. //depot/projects/arp-v2/src/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/Makefile#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/README#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/compress.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/BUGS#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/FAQ#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/HACKING#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/INSTALL#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/NEWS#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/README#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/TESTS#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/TODO#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/compile#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/config.h.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/configure#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/configure.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/README#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/arp-v2/src/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/depcomp#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/HACKING.DOCS#1 branch .. //depot/projects/arp-v2/src/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/mdate-sh#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/arp-v2/src/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/arp-v2/src/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/install-sh#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/arp-v2/src/contrib/cvs/lib/xsize.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/missing#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/mkinstalldirs#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/add.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/client.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/client.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/edit.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/filesubr.c#3 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/history.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/history.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/import.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/log.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/login.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/main.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/parseinfo.c#3 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/release.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/root.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/root.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/run.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/server.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/server.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/status.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/update.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/version.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/tools/README#2 integrate .. //depot/projects/arp-v2/src/contrib/file/ChangeLog#2 integrate .. //depot/projects/arp-v2/src/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/animation#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/apple#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/archive#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/audio#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/bFLT#2 delete .. //depot/projects/arp-v2/src/contrib/file/Magdir/blender#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/chi#2 delete .. //depot/projects/arp-v2/src/contrib/file/Magdir/commands#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/console#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/cvs#2 delete .. //depot/projects/arp-v2/src/contrib/file/Magdir/database#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/efi#1 branch .. //depot/projects/arp-v2/src/contrib/file/Magdir/elf#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/fortran#1 branch .. //depot/projects/arp-v2/src/contrib/file/Magdir/hdf#2 delete .. //depot/projects/arp-v2/src/contrib/file/Magdir/impulse#2 delete .. //depot/projects/arp-v2/src/contrib/file/Magdir/java#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Magdir/wordperfect#2 delete .. //depot/projects/arp-v2/src/contrib/file/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/file/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/file/acconfig.h#2 delete .. //depot/projects/arp-v2/src/contrib/file/acinclude.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/file/aclocal.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/file/apprentice.c#2 integrate .. //depot/projects/arp-v2/src/contrib/file/ascmagic.c#2 integrate .. //depot/projects/arp-v2/src/contrib/file/compress.c#2 integrate .. //depot/projects/arp-v2/src/contrib/file/config.h.in#2 integrate .. //depot/projects/arp-v2/src/contrib/file/configure#2 integrate .. //depot/projects/arp-v2/src/contrib/file/configure.in#2 integrate .. //depot/projects/arp-v2/src/contrib/file/file.c#2 integrate .. //depot/projects/arp-v2/src/contrib/file/file.h#2 integrate .. //depot/projects/arp-v2/src/contrib/file/file.man#2 integrate .. //depot/projects/arp-v2/src/contrib/file/file_opts.h#1 branch .. //depot/projects/arp-v2/src/contrib/file/fsmagic.c#2 integrate .. //depot/projects/arp-v2/src/contrib/file/funcs.c#2 integrate .. //depot/projects/arp-v2/src/contrib/file/install-sh#2 integrate .. //depot/projects/arp-v2/src/contrib/file/is_tar.c#2 integrate .. //depot/projects/arp-v2/src/contrib/file/libmagic.man#2 integrate .. //depot/projects/arp-v2/src/contrib/file/magic.c#2 integrate .. //depot/projects/arp-v2/src/contrib/file/magic.h#2 integrate .. //depot/projects/arp-v2/src/contrib/file/magic.man#2 integrate .. //depot/projects/arp-v2/src/contrib/file/magic.mime#2 integrate .. //depot/projects/arp-v2/src/contrib/file/missing#2 delete .. //depot/projects/arp-v2/src/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/arp-v2/src/contrib/file/names.h#2 integrate .. //depot/projects/arp-v2/src/contrib/file/patchlevel.h#2 integrate .. //depot/projects/arp-v2/src/contrib/file/print.c#2 integrate .. //depot/projects/arp-v2/src/contrib/file/readelf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/file/readelf.h#2 integrate .. //depot/projects/arp-v2/src/contrib/file/softmagic.c#2 integrate .. //depot/projects/arp-v2/src/contrib/file/stamp-h.in#2 delete .. //depot/projects/arp-v2/src/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/arp-v2/src/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/Makefile#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/README#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/common.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/common.h#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/defconfig#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/driver.h#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/eap_aka.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/eap_gpsk.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/eap_gpsk_common.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/eap_gpsk_common.h#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/eapol_version.patch#2 delete .. //depot/projects/arp-v2/src/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/os.h#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/os_unix.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/radius.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/radius.h#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/version.h#2 integrate .. //depot/projects/arp-v2/src/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/arp-v2/src/contrib/libiberty/cp-demangle.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/FREEBSD-upgrade#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/FREEBSD-vendor#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/MANIFEST#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/NEWS#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/dist.mk#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/frm_driver.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/curses.h.in#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/ncurses_defs#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_threads.3x#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/man/man_db.renames#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/toe.1m#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/misc/terminfo.src#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/MKlib_gen.sh#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/MKunctrl.awk#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_getch.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_newterm.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_newwin.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_set_term.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_slkinit.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/resizeterm.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/use_window.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/curses.priv.h#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/llib-lncursest#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_data.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/infocmp.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/toe.c#3 integrate .. //depot/projects/arp-v2/src/contrib/netcat/nc.1#2 integrate .. //depot/projects/arp-v2/src/contrib/netcat/netcat.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/FREEBSD-vendor#1 branch .. //depot/projects/arp-v2/src/contrib/openpam/include/security/openpam_version.h#3 integrate .. //depot/projects/arp-v2/src/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zdb/zdb.8#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zdb/zdb.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zdb/zdb_il.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zfs/zfs.8#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zfs/zfs_util.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zpool/zpool.8#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zpool/zpool_main.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zpool/zpool_util.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zpool/zpool_util.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/cmd/ztest/ztest.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/head/atomic.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/head/libintl.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/head/stdio_ext.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/head/synch.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/head/thread.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzpool/common/kernel.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzpool/common/taskq.c#2 delete .. //depot/projects/arp-v2/src/contrib/opensolaris/lib/libzpool/common/util.c#2 delete .. //depot/projects/arp-v2/src/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/arp-v2/src/contrib/pf/pfctl/pfctl_altq.c#2 integrate .. //depot/projects/arp-v2/src/contrib/pf/pfctl/pfctl_qstats.c#2 integrate .. //depot/projects/arp-v2/src/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/arp-v2/src/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/arp-v2/src/contrib/top/display.c#2 integrate .. //depot/projects/arp-v2/src/contrib/top/layout.h#2 integrate .. //depot/projects/arp-v2/src/contrib/top/machine.h#2 integrate .. //depot/projects/arp-v2/src/contrib/top/top.c#3 integrate .. //depot/projects/arp-v2/src/contrib/top/top.h#2 integrate .. //depot/projects/arp-v2/src/contrib/traceroute/as.c#1 branch .. //depot/projects/arp-v2/src/contrib/traceroute/as.h#1 branch .. //depot/projects/arp-v2/src/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/arp-v2/src/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/FREEBSD-upgrade#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/asn1.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/config_winreg.c#2 delete .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#2 delete .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/driver_hostap.h#2 delete .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/eap_gpsk.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/eloop_win.c#2 delete .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/events.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/main.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/os.h#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/os_unix.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/tests/test_aes.c#1 branch .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/tests/test_md4.c#1 branch .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/tests/test_md5.c#1 branch .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/tests/test_sha1.c#1 branch .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/tests/test_sha256.c#1 branch .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/arp-v2/src/contrib/wpa_supplicant/x509v3.c#2 integrate .. //depot/projects/arp-v2/src/crypto/openssh/FREEBSD-Xlist#2 integrate .. //depot/projects/arp-v2/src/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/arp-v2/src/crypto/openssh/FREEBSD-vendor#1 branch .. //depot/projects/arp-v2/src/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate .. //depot/projects/arp-v2/src/etc/Makefile#2 integrate .. //depot/projects/arp-v2/src/etc/ddb.conf#1 branch .. //depot/projects/arp-v2/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/arp-v2/src/etc/devd.conf#2 integrate .. //depot/projects/arp-v2/src/etc/freebsd-update.conf#2 integrate .. //depot/projects/arp-v2/src/etc/mail/access.sample#2 integrate .. //depot/projects/arp-v2/src/etc/namedb/named.conf#2 integrate .. //depot/projects/arp-v2/src/etc/namedb/named.root#2 integrate .. //depot/projects/arp-v2/src/etc/netstart#2 integrate .. //depot/projects/arp-v2/src/etc/network.subr#2 integrate .. //depot/projects/arp-v2/src/etc/newsyslog.conf#2 integrate .. //depot/projects/arp-v2/src/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/arp-v2/src/etc/periodic/security/410.logincheck#2 integrate .. //depot/projects/arp-v2/src/etc/rc#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/ddb#1 branch .. //depot/projects/arp-v2/src/etc/rc.d/dhclient#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/hostid#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/ipfw#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/jail#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/kerberos#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/mountlate#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/netif#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/ppp#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/root#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/zfs#2 integrate .. //depot/projects/arp-v2/src/etc/rc.firewall#2 integrate .. //depot/projects/arp-v2/src/etc/rc.firewall6#2 integrate .. //depot/projects/arp-v2/src/etc/rc.subr#2 integrate .. //depot/projects/arp-v2/src/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/arp-v2/src/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/arp-v2/src/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/arp-v2/src/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/binutils/ar/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/cvs/lib/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/cvs/lib/config.h.proto#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/kgdb/kld.c#1 branch .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/man/man/man.c#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/man/manpath/manpath.c#2 integrate .. //depot/projects/arp-v2/src/include/complex.h#3 integrate .. //depot/projects/arp-v2/src/include/fts.h#2 integrate .. //depot/projects/arp-v2/src/include/pthread.h#2 integrate .. //depot/projects/arp-v2/src/include/pthread_np.h#3 integrate .. //depot/projects/arp-v2/src/include/stdio.h#2 integrate .. //depot/projects/arp-v2/src/include/time.h#2 integrate .. //depot/projects/arp-v2/src/include/unistd.h#2 integrate .. //depot/projects/arp-v2/src/lib/Makefile#3 integrate .. //depot/projects/arp-v2/src/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/Makefile#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry_strmode.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_ar.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_compression_compress.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_ar.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/.cvsignore#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/main.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test.h#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_tar_hardlink.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_empty_write.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_pax_filename_encoding.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_compress.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/db/test/btree.tests/main.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/db/test/dbtest.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/err.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/feature_present.3#1 branch .. //depot/projects/arp-v2/src/lib/libc/gen/feature_present.c#1 branch .. //depot/projects/arp-v2/src/lib/libc/gen/fts-compat.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/fts-compat.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/fts.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/fts.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/lockf.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/modf.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/msgctl.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/scandir.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/arp-v2/src/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/_fpmath.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/include/namespace.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libc/locale/ascii.c#1 branch .. //depot/projects/arp-v2/src/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/locale/wctype.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/posix1e/mac_get.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/posix1e/mac_set.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/powerpc/gen/flt_rounds.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/powerpc/gen/fpgetmask.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/powerpc/gen/fpgetround.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/powerpc/gen/fpgetsticky.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/powerpc/gen/fpsetmask.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/powerpc/gen/fpsetround.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/regex/grot/main.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/rpc/svc_vc.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sparc64/_fpmath.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdio/fdopen.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdio/fopen.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdio/freopen.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdtime/localtime.c#3 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/access.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/aio_cancel.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/cpuset.2#1 branch .. //depot/projects/arp-v2/src/lib/libc/sys/cpuset_getaffinity.2#1 branch .. //depot/projects/arp-v2/src/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/arp-v2/src/lib/libc/sys/flock.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/readlink.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/xdr/xdr_rec.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/yp/xdryp.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc_r/uthread/uthread_sig.c#2 integrate .. //depot/projects/arp-v2/src/lib/libdevstat/devstat.h#2 integrate .. //depot/projects/arp-v2/src/lib/libdisk/disk.c#2 integrate .. //depot/projects/arp-v2/src/lib/libelf/elf_update.3#2 integrate .. //depot/projects/arp-v2/src/lib/libelf/elf_update.c#2 integrate .. //depot/projects/arp-v2/src/lib/libelf/gelf_fsize.3#2 integrate .. //depot/projects/arp-v2/src/lib/libelf/gelf_rel.c#2 integrate .. //depot/projects/arp-v2/src/lib/libelf/gelf_rela.c#2 integrate .. //depot/projects/arp-v2/src/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/arp-v2/src/lib/libfetch/common.c#3 integrate .. //depot/projects/arp-v2/src/lib/libfetch/fetch.3#3 integrate .. //depot/projects/arp-v2/src/lib/libfetch/ftp.c#3 integrate .. //depot/projects/arp-v2/src/lib/libfetch/http.c#3 integrate .. //depot/projects/arp-v2/src/lib/libkse/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/kse.map#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_mutex.c#3 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_sig.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkvm/kvm.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/arp-v2/src/lib/libmagic/config.h#2 integrate .. //depot/projects/arp-v2/src/lib/libmilter/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/arp-v2/src/lib/libpmc/pmc.3#2 integrate .. //depot/projects/arp-v2/src/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/arp-v2/src/lib/librpcsvc/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/librpcsvc/xcrypt.c#2 integrate .. //depot/projects/arp-v2/src/lib/libsdp/sdp.h#2 integrate .. //depot/projects/arp-v2/src/lib/libstand/nfs.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/arp-v2/src/lib/libthr/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/arch/arm/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/arch/i386/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/arp-v2/src/lib/libthr/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/pthread.map#3 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_affinity.c#1 branch .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_cond.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_exit.c#3 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_getcpuclockid.c#1 branch .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_mutexattr.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_rtld.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_rwlock.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_sem.c#3 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/arp-v2/src/lib/libthread_db/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libthread_db/kse.h#1 branch .. //depot/projects/arp-v2/src/lib/libthread_db/libc_r_db.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthread_db/libpthread_db.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthread_db/libthr_db.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthread_db/thread_db.c#2 integrate .. //depot/projects/arp-v2/src/lib/libutil/humanize_number.c#2 integrate .. //depot/projects/arp-v2/src/lib/libutil/pty.3#2 integrate .. //depot/projects/arp-v2/src/lib/libutil/pty.c#3 integrate .. //depot/projects/arp-v2/src/lib/msun/Makefile#3 integrate .. //depot/projects/arp-v2/src/lib/msun/Symbol.map#3 integrate .. //depot/projects/arp-v2/src/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/arp-v2/src/lib/msun/amd64/e_remainder.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/amd64/e_remainderf.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/amd64/e_remainderl.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/amd64/e_sqrtl.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/amd64/s_llrintl.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/amd64/s_lrintl.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/amd64/s_remquol.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/amd64/s_rintl.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/bsdsrc/b_exp.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/bsdsrc/b_log.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/bsdsrc/b_tgamma.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/arp-v2/src/lib/msun/i387/e_remainderl.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/i387/e_sqrtl.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/i387/s_llrintl.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/i387/s_lrintl.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/i387/s_remquol.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/i387/s_rintl.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/ld128/k_cosl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/ld128/k_sinl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/ld128/k_tanl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/ld128/s_exp2l.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/ld128/s_nanl.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/ld80/k_cosl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/ld80/k_sinl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/ld80/k_tanl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/ld80/s_exp2l.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/man/cos.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/csqrt.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/exp.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/hypot.3#3 integrate .. //depot/projects/arp-v2/src/lib/msun/man/j0.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/lgamma.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/log.3#1 branch .. //depot/projects/arp-v2/src/lib/msun/man/lrint.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/remainder.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/rint.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/sin.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/sqrt.3#3 integrate .. //depot/projects/arp-v2/src/lib/msun/man/tan.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/powerpc/fenv.h#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_acos.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_acosf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_acosh.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_acoshf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_asin.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_asinf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_atan2.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_atan2f.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_atanh.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_atanhf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_cosh.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_coshf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_exp.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_expf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_fmod.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_fmodf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_gamma.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_gamma_r.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_gammaf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_gammaf_r.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_hypot.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_hypotf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_hypotl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/src/e_j0.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_j0f.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_j1.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_j1f.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_jn.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_jnf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_lgamma.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_lgamma_r.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_lgammaf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_lgammaf_r.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_log.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_log10.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_log10f.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_logf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_pow.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_powf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_rem_pio2.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_remainder.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_remainderf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_remainderl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/src/e_scalb.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_scalbf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_sinh.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_sinhf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_sqrt.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/e_sqrtl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/src/k_cos.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/k_rem_pio2.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/k_rem_pio2f.c#2 delete .. //depot/projects/arp-v2/src/lib/msun/src/k_sin.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/k_sinf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/k_tan.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/k_tanf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/math.h#3 integrate .. //depot/projects/arp-v2/src/lib/msun/src/math_private.h#3 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_asinh.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_asinhf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_atan.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_atanf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_cbrt.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_cbrtf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_ceil.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_ceilf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_ceill.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_copysign.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_copysignf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_cos.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_cosf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_cosl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_csqrtf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_csqrtl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/src/s_erf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_erff.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_exp2.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_exp2f.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_expm1.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_expm1f.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_fabsf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_finite.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_finitef.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_floor.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_floorf.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_floorl.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_fma.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_fmaf.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 9 05:37:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C46FD1065670; Wed, 9 Apr 2008 05:37:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85E2C106564A for ; Wed, 9 Apr 2008 05:37:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 73EC68FC36 for ; Wed, 9 Apr 2008 05:37:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m395bP8K046795 for ; Wed, 9 Apr 2008 05:37:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m395bPOh046793 for perforce@freebsd.org; Wed, 9 Apr 2008 05:37:25 GMT (envelope-from sam@freebsd.org) Date: Wed, 9 Apr 2008 05:37:25 GMT Message-Id: <200804090537.m395bPOh046793@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 Cc: Subject: PERFORCE change 139632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2008 05:37:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=139632 Change 139632 by sam@sam_ebb on 2008/04/09 05:36:24 IFC @ 139631 Affected files ... .. //depot/projects/vap/UPDATING#7 integrate .. //depot/projects/vap/etc/defaults/rc.conf#9 integrate .. //depot/projects/vap/etc/rc.d/Makefile#5 integrate .. //depot/projects/vap/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/vap/etc/rc.d/wpa_supplicant#6 integrate .. //depot/projects/vap/share/man/man4/psm.4#3 integrate .. //depot/projects/vap/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/vap/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/vap/sys/ia64/ia64/sscdisk.c#6 integrate .. //depot/projects/vap/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/vap/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/vap/sys/netinet/ip_input.c#7 integrate .. //depot/projects/vap/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/vap/sys/netinet/ip_ipsec.h#3 integrate .. //depot/projects/vap/sys/powerpc/include/atomic.h#8 integrate .. //depot/projects/vap/sys/sys/eventhandler.h#7 integrate .. //depot/projects/vap/sys/sys/kernel.h#9 integrate .. //depot/projects/vap/sys/sys/param.h#16 integrate .. //depot/projects/vap/usr.sbin/sysinstall/menus.c#5 integrate Differences ... ==== //depot/projects/vap/UPDATING#7 (text+ko) ==== @@ -22,6 +22,13 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080408: + psm(4) has gained write(2) support in native operation level. + Arbitrary commands can be written to /dev/psm%d and status can + be read back from it. Therefore, an application is responsible + for status validation and error recovery. It is a no-op in + other operation levels. + 20080312: Support for KSE threading has been removed from the kernel. To run legacy applications linked against KSE libmap.conf may @@ -1007,4 +1014,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ +$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $ ==== //depot/projects/vap/etc/defaults/rc.conf#9 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -384,6 +384,19 @@ bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file +rfcomm_pppd_server_enable="NO" # Enable rfcomm_pppd(8) in server mode (or NO) +rfcomm_pppd_server_profile="one two" # Profile to use from /etc/ppp/ppp.conf +# +#rfcomm_pppd_server_one_bdaddr="" # Override local bdaddr for 'one' +rfcomm_pppd_server_one_channel="1" # Override local channel for 'one' +#rfcomm_pppd_server_one_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_one_register_dun="NO" # for 'one' +# +#rfcomm_pppd_server_two_bdaddr="" # Override local bdaddr for 'two' +rfcomm_pppd_server_two_channel="3" # Override local channel for 'two' +#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_two_register_dun="NO" # for 'two' + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ==== //depot/projects/vap/etc/rc.d/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.90 2008/04/08 23:34:12 emax Exp $ .include @@ -29,7 +29,7 @@ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - random rarpd resolv root \ + random rarpd resolv rfcomm_pppd_server root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ serial sppp statd swap1 \ ==== //depot/projects/vap/etc/rc.d/wpa_supplicant#6 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.2 2005/10/19 22:26:47 jkim Exp $ +# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $ # # PROVIDE: wpa_supplicant @@ -20,15 +20,14 @@ is_wired_interface() { - media= - ifconfig $1 2>/dev/null | while read line; do + media=`ifconfig $1 2>/dev/null | while read line; do case "$line" in - *media:*Ethernet*) - media="Ethernet" + *media:?Ethernet*) + echo Ethernet ;; esac - done - test -z "$media" + done` + test "$media" = "Ethernet" } case ${ifn} in @@ -49,7 +48,7 @@ command=${wpa_supplicant_program} conf_file=${wpa_supplicant_conf_file} pidfile="/var/run/${name}/${ifn}.pid" -command_args="-B ${wpa_supplicant_flags} -i $ifn -c $conf_file -D $driver -P $pidfile" +command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file run_rc_command "$1" ==== //depot/projects/vap/share/man/man4/psm.4#3 (text+ko) ==== @@ -24,9 +24,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/psm.4,v 1.48 2005/07/15 17:35:25 hrs Exp $ +.\" $FreeBSD: src/share/man/man4/psm.4,v 1.49 2008/04/08 17:55:25 jkim Exp $ .\" -.Dd September 29, 2004 +.Dd April 8, 2008 .Dt PSM 4 .Os .Sh NAME @@ -110,7 +110,9 @@ 8 byte data packets are sent to the user program at this level. .Pp At the operation level two, data from the pointing device is passed to the -user program as is. +user program as is. Conversely, command from the user program is passed +to the pointing device as is and the user program is responsible for +status validation and error recovery. Modern PS/2 type pointing devices often use proprietary data format. Therefore, the user program is expected to have intimate knowledge about the format from a particular device when operating ==== //depot/projects/vap/share/man/man5/rc.conf.5#7 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.337 2008/03/28 07:57:52 brooks Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.338 2008/04/08 23:34:12 emax Exp $ .\" .Dd January 27, 2008 .Dt RC.CONF 5 @@ -3880,6 +3880,108 @@ If set to .Dq Li YES , enable support for sound mixer. +.It Va hcsecd_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable Bluetooth security daemon. +.It Va hcsecd_config +.Pq Vt str +Configuration file for +.Xr hcsecd 8 . +Default +.Pa /etc/bluetooth/hcsecd.conf . +.It Va sdpd_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable Bluetooth Service Discovery Protocol daemon. +.It Va sdpd_control +.Pq Vt str +Path to +.Xr sdpd 8 +control socket. +Default +.Pa /var/run/sdp . +.It Va sdpd_groupname +.Pq Vt str +Sets +.Xr sdpd 8 +group to run as after it initializes. +Default +.Dq Li nobody . +.It Va sdpd_username +.Pq Vt str +Sets +.Xr sdpd 8 +user to run as after it initializes. +Default +.Dq Li nobody . +.It Va bthidd_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable Bluetooth Human Interface Device daemon. +.It Va bthidd_config +.Pq Vt str +Configuration file for +.Xr bthidd 8 . +Default +.Pa /etc/bluetooth/bthidd.conf . +.It Va bthidd_hids +.Pq Vt str +Path to a file, where +.Xr bthidd 8 +will store information about known HID devices. +Default +.Pa /var/db/bthidd.hids . +.It Va rfcomm_pppd_server_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable Bluetooth RFCOMM PPP wrapper daemon. +.It Va rfcomm_pppd_server_profile +.Pq Vt str +The name of the profile to use from +.Pa /etc/ppp/ppp.conf . +Multiple profiles can be specified here. +Also used to specify per-profile overrides. +When the profile name contains any of the characters +.Dq Li .-/+ +they are translated to +.Dq Li _ +for the proposes of the override variable names. +.It Va rfcomm_pppd_server_ Ns Ao Ar profile Ac Ns _bdaddr +.Pq Vt str +Overrides local address to listen on. +By default +.Xr rfcomm_pppd 8 +will listen on +.Dq Li ANY +address. +The address can be specified as BD_ADDR or name. +.It Va rfcomm_pppd_server_ Ns Ao Ar profile Ac Ns _channel +.Pq Vt str +Overrides local RFCOMM channel to listen on. +By default +.Xr rfcomm_pppd 8 +will listen on RFCOMM channel 1. +Must set properly if multiple profiles used in the same time. +.It Va rfcomm_pppd_server_ Ns Ao Ar profile Ac Ns _register_sp +.Pq Vt bool +Tells +.Xr rfcomm_pppd 8 +if it should register Serial Port service on the speficied RFCOMM channel. +Default +.Dq Li NO . +.It Va rfcomm_pppd_server_ Ns Ao Ar profile Ac Ns _register_dun +.Pq Vt bool +Tells +.Xr rfcomm_pppd 8 +if it should register Dial-Up Networking service on the speficied +RFCOMM channel. +Default +.Dq Li NO . .El .Sh FILES .Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact @@ -3920,12 +4022,14 @@ .Xr amd 8 , .Xr apm 8 , .Xr atm 8 , +.Xr bthidd 8 , .Xr chkprintcap 8 , .Xr chown 8 , .Xr cron 8 , .Xr dhclient 8 , .Xr ftpd 8 , .Xr geli 8 , +.Xr hcsecd 8 , .Xr ifconfig 8 , .Xr inetd 8 , .Xr ipf 8 , @@ -3955,6 +4059,7 @@ .Xr quotaon 8 , .Xr rc 8 , .Xr rc.sendmail 8 , +.Xr rfcomm_pppd 8 , .Xr route 8 , .Xr routed 8 , .Xr rpcbind 8 , @@ -3962,6 +4067,7 @@ .Xr rpc.statd 8 , .Xr rwhod 8 , .Xr savecore 8 , +.Xr sdpd 8 , .Xr sshd 8 , .Xr swapon 8 , .Xr sysctl 8 , ==== //depot/projects/vap/sys/dev/atkbdc/psm.c#4 (text+ko) ==== @@ -50,16 +50,16 @@ * - 12 November 1996. IOCTLs and rearranging `psmread', `psmioctl'... * - 14, 30 November 1996. Uses `kbdio.c'. * - 13 December 1996. Uses queuing version of `kbdio.c'. - * - January/February 1997. Tweaked probe logic for + * - January/February 1997. Tweaked probe logic for * HiNote UltraII/Latitude/Armada laptops. * - 30 July 1997. Added APM support. - * - 5 March 1997. Defined driver configuration flags (PSM_CONFIG_XXX). + * - 5 March 1997. Defined driver configuration flags (PSM_CONFIG_XXX). * Improved sync check logic. * Vendor specific support routines. */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.94 2008/02/25 13:57:18 rink Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.96 2008/04/08 19:09:45 jkim Exp $"); #include "opt_isa.h" #include "opt_psm.h" @@ -97,158 +97,159 @@ /* debugging */ #ifndef PSM_DEBUG -#define PSM_DEBUG 0 /* +#define PSM_DEBUG 0 /* * logging: 0: none, 1: brief, 2: verbose * 3: sync errors, 4: all packets */ #endif -#define VLOG(level, args) \ -do { \ - if (verbose >= level) \ - log args; \ +#define VLOG(level, args) do { \ + if (verbose >= level) \ + log args; \ } while (0) #ifndef PSM_INPUT_TIMEOUT -#define PSM_INPUT_TIMEOUT 2000000 /* 2 sec */ +#define PSM_INPUT_TIMEOUT 2000000 /* 2 sec */ #endif #ifndef PSM_TAP_TIMEOUT -#define PSM_TAP_TIMEOUT 125000 +#define PSM_TAP_TIMEOUT 125000 #endif #ifndef PSM_TAP_THRESHOLD -#define PSM_TAP_THRESHOLD 25 +#define PSM_TAP_THRESHOLD 25 #endif /* end of driver specific options */ -#define PSMCPNP_DRIVER_NAME "psmcpnp" +#define PSMCPNP_DRIVER_NAME "psmcpnp" /* input queue */ -#define PSM_BUFSIZE 960 -#define PSM_SMALLBUFSIZE 240 +#define PSM_BUFSIZE 960 +#define PSM_SMALLBUFSIZE 240 /* operation levels */ -#define PSM_LEVEL_BASE 0 -#define PSM_LEVEL_STANDARD 1 -#define PSM_LEVEL_NATIVE 2 -#define PSM_LEVEL_MIN PSM_LEVEL_BASE -#define PSM_LEVEL_MAX PSM_LEVEL_NATIVE +#define PSM_LEVEL_BASE 0 +#define PSM_LEVEL_STANDARD 1 +#define PSM_LEVEL_NATIVE 2 +#define PSM_LEVEL_MIN PSM_LEVEL_BASE +#define PSM_LEVEL_MAX PSM_LEVEL_NATIVE /* Logitech PS2++ protocol */ -#define MOUSE_PS2PLUS_CHECKBITS(b) \ - ((((b[2] & 0x03) << 2) | 0x02) == (b[1] & 0x0f)) -#define MOUSE_PS2PLUS_PACKET_TYPE(b) \ - (((b[0] & 0x30) >> 2) | ((b[1] & 0x30) >> 4)) +#define MOUSE_PS2PLUS_CHECKBITS(b) \ + ((((b[2] & 0x03) << 2) | 0x02) == (b[1] & 0x0f)) +#define MOUSE_PS2PLUS_PACKET_TYPE(b) \ + (((b[0] & 0x30) >> 2) | ((b[1] & 0x30) >> 4)) /* some macros */ -#define PSM_UNIT(dev) (minor(dev) >> 1) -#define PSM_NBLOCKIO(dev) (minor(dev) & 1) -#define PSM_MKMINOR(unit,block) (((unit) << 1) | ((block) ? 0:1)) +#define PSM_UNIT(dev) (minor(dev) >> 1) +#define PSM_NBLOCKIO(dev) (minor(dev) & 1) +#define PSM_MKMINOR(unit,block) (((unit) << 1) | ((block) ? 0:1)) /* ring buffer */ typedef struct ringbuf { - int count; /* # of valid elements in the buffer */ - int head; /* head pointer */ - int tail; /* tail poiner */ - unsigned char buf[PSM_BUFSIZE]; + int count; /* # of valid elements in the buffer */ + int head; /* head pointer */ + int tail; /* tail poiner */ + u_char buf[PSM_BUFSIZE]; } ringbuf_t; /* data buffer */ typedef struct packetbuf { - unsigned char ipacket[16]; /* interim input buffer */ - int inputbytes; /* # of bytes in the input buffer */ + u_char ipacket[16]; /* interim input buffer */ + int inputbytes; /* # of bytes in the input buffer */ } packetbuf_t; #ifndef PSM_PACKETQUEUE -#define PSM_PACKETQUEUE 128 +#define PSM_PACKETQUEUE 128 #endif typedef struct synapticsinfo { - struct sysctl_ctx_list sysctl_ctx; - struct sysctl_oid *sysctl_tree; - int directional_scrolls; - int low_speed_threshold; - int min_movement; - int squelch_level; + struct sysctl_ctx_list sysctl_ctx; + struct sysctl_oid *sysctl_tree; + int directional_scrolls; + int low_speed_threshold; + int min_movement; + int squelch_level; } synapticsinfo_t; /* driver control block */ struct psm_softc { /* Driver status information */ - int unit; - struct selinfo rsel; /* Process selecting for Input */ - unsigned char state; /* Mouse driver state */ - int config; /* driver configuration flags */ - int flags; /* other flags */ - KBDC kbdc; /* handle to access the keyboard controller */ - struct resource *intr; /* IRQ resource */ - void *ih; /* interrupt handle */ - mousehw_t hw; /* hardware information */ - synapticshw_t synhw; /* Synaptics-specific hardware information */ - synapticsinfo_t syninfo; /* Synaptics-specific configuration */ - mousemode_t mode; /* operation mode */ - mousemode_t dflt_mode; /* default operation mode */ - mousestatus_t status; /* accumulated mouse movement */ - ringbuf_t queue; /* mouse status queue */ - packetbuf_t pqueue[PSM_PACKETQUEUE]; /* mouse data queue */ - int pqueue_start; /* start of data in queue */ - int pqueue_end; /* end of data in queue */ - int button; /* the latest button state */ - int xold; /* previous absolute X position */ - int yold; /* previous absolute Y position */ - int xaverage; /* average X position */ - int yaverage; /* average Y position */ - int squelch; /* level to filter movement data at low speed */ - int zmax; /* maximum pressure value for touchpads */ - int syncerrors; /* # of bytes discarded searching for sync */ - int pkterrors; /* # of packets failed during quaranteen. */ - struct timeval inputtimeout; - struct timeval lastsoftintr; /* time of last soft interrupt */ - struct timeval lastinputerr; /* time last sync error happened */ - struct timeval taptimeout; /* tap timeout for touchpads */ - int watchdog; /* watchdog timer flag */ - struct callout_handle callout; /* watchdog timer call out */ - struct callout_handle softcallout; /* buffer timer call out */ - struct cdev *dev; - struct cdev *bdev; - int lasterr; - int cmdcount; + int unit; + struct selinfo rsel; /* Process selecting for Input */ + u_char state; /* Mouse driver state */ + int config; /* driver configuration flags */ + int flags; /* other flags */ + KBDC kbdc; /* handle to access kbd controller */ + struct resource *intr; /* IRQ resource */ + void *ih; /* interrupt handle */ + mousehw_t hw; /* hardware information */ + synapticshw_t synhw; /* Synaptics hardware information */ + synapticsinfo_t syninfo; /* Synaptics configuration */ + mousemode_t mode; /* operation mode */ + mousemode_t dflt_mode; /* default operation mode */ + mousestatus_t status; /* accumulated mouse movement */ + ringbuf_t queue; /* mouse status queue */ + packetbuf_t pqueue[PSM_PACKETQUEUE]; /* mouse data queue */ + int pqueue_start; /* start of data in queue */ + int pqueue_end; /* end of data in queue */ + int button; /* the latest button state */ + int xold; /* previous absolute X position */ + int yold; /* previous absolute Y position */ + int xaverage; /* average X position */ + int yaverage; /* average Y position */ + int squelch; /* level to filter movement at low speed */ + int zmax; /* maximum pressure value for touchpads */ + int syncerrors; /* # of bytes discarded to synchronize */ + int pkterrors; /* # of packets failed during quaranteen. */ + struct timeval inputtimeout; + struct timeval lastsoftintr; /* time of last soft interrupt */ + struct timeval lastinputerr; /* time last sync error happened */ + struct timeval taptimeout; /* tap timeout for touchpads */ + int watchdog; /* watchdog timer flag */ + struct callout_handle callout; /* watchdog timer call out */ + struct callout_handle softcallout; /* buffer timer call out */ + struct cdev *dev; + struct cdev *bdev; + int lasterr; + int cmdcount; }; static devclass_t psm_devclass; -#define PSM_SOFTC(unit) ((struct psm_softc*)devclass_get_softc(psm_devclass, unit)) +#define PSM_SOFTC(unit) \ + ((struct psm_softc*)devclass_get_softc(psm_devclass, unit)) /* driver state flags (state) */ -#define PSM_VALID 0x80 -#define PSM_OPEN 1 /* Device is open */ -#define PSM_ASLP 2 /* Waiting for mouse data */ -#define PSM_SOFTARMED 4 /* Software interrupt armed */ -#define PSM_NEED_SYNCBITS 8 /* Set syncbits using next data pkt */ +#define PSM_VALID 0x80 +#define PSM_OPEN 1 /* Device is open */ +#define PSM_ASLP 2 /* Waiting for mouse data */ +#define PSM_SOFTARMED 4 /* Software interrupt armed */ +#define PSM_NEED_SYNCBITS 8 /* Set syncbits using next data pkt */ /* driver configuration flags (config) */ -#define PSM_CONFIG_RESOLUTION 0x000f /* resolution */ -#define PSM_CONFIG_ACCEL 0x00f0 /* acceleration factor */ -#define PSM_CONFIG_NOCHECKSYNC 0x0100 /* disable sync. test */ -#define PSM_CONFIG_NOIDPROBE 0x0200 /* disable mouse model probe */ -#define PSM_CONFIG_NORESET 0x0400 /* don't reset the mouse */ -#define PSM_CONFIG_FORCETAP 0x0800 /* assume `tap' action exists */ -#define PSM_CONFIG_IGNPORTERROR 0x1000 /* ignore error in aux port test */ -#define PSM_CONFIG_HOOKRESUME 0x2000 /* hook the system resume event */ -#define PSM_CONFIG_INITAFTERSUSPEND 0x4000 /* init the device at the resume event */ -#define PSM_CONFIG_SYNCHACK 0x8000 /* enable `out-of-sync' hack */ +#define PSM_CONFIG_RESOLUTION 0x000f /* resolution */ +#define PSM_CONFIG_ACCEL 0x00f0 /* acceleration factor */ +#define PSM_CONFIG_NOCHECKSYNC 0x0100 /* disable sync. test */ +#define PSM_CONFIG_NOIDPROBE 0x0200 /* disable mouse model probe */ +#define PSM_CONFIG_NORESET 0x0400 /* don't reset the mouse */ +#define PSM_CONFIG_FORCETAP 0x0800 /* assume `tap' action exists */ +#define PSM_CONFIG_IGNPORTERROR 0x1000 /* ignore error in aux port test */ +#define PSM_CONFIG_HOOKRESUME 0x2000 /* hook the system resume event */ +#define PSM_CONFIG_INITAFTERSUSPEND 0x4000 /* init the device at the resume event */ +#define PSM_CONFIG_SYNCHACK 0x8000 /* enable `out-of-sync' hack */ -#define PSM_CONFIG_FLAGS (PSM_CONFIG_RESOLUTION \ - | PSM_CONFIG_ACCEL \ - | PSM_CONFIG_NOCHECKSYNC \ - | PSM_CONFIG_SYNCHACK \ - | PSM_CONFIG_NOIDPROBE \ - | PSM_CONFIG_NORESET \ - | PSM_CONFIG_FORCETAP \ - | PSM_CONFIG_IGNPORTERROR \ - | PSM_CONFIG_HOOKRESUME \ - | PSM_CONFIG_INITAFTERSUSPEND) +#define PSM_CONFIG_FLAGS \ + (PSM_CONFIG_RESOLUTION | \ + PSM_CONFIG_ACCEL | \ + PSM_CONFIG_NOCHECKSYNC | \ + PSM_CONFIG_SYNCHACK | \ + PSM_CONFIG_NOIDPROBE | \ + PSM_CONFIG_NORESET | \ + PSM_CONFIG_FORCETAP | \ + PSM_CONFIG_IGNPORTERROR | \ + PSM_CONFIG_HOOKRESUME | \ + PSM_CONFIG_INITAFTERSUSPEND) /* other flags (flags) */ -#define PSM_FLAGS_FINGERDOWN 0x0001 /* VersaPad finger down */ +#define PSM_FLAGS_FINGERDOWN 0x0001 /* VersaPad finger down */ /* Tunables */ static int synaptics_support = 0; @@ -258,119 +259,129 @@ TUNABLE_INT("debug.psm.loglevel", &verbose); /* for backward compatibility */ -#define OLD_MOUSE_GETHWINFO _IOR('M', 1, old_mousehw_t) -#define OLD_MOUSE_GETMODE _IOR('M', 2, old_mousemode_t) -#define OLD_MOUSE_SETMODE _IOW('M', 3, old_mousemode_t) +#define OLD_MOUSE_GETHWINFO _IOR('M', 1, old_mousehw_t) +#define OLD_MOUSE_GETMODE _IOR('M', 2, old_mousemode_t) +#define OLD_MOUSE_SETMODE _IOW('M', 3, old_mousemode_t) typedef struct old_mousehw { - int buttons; - int iftype; - int type; - int hwid; + int buttons; + int iftype; + int type; + int hwid; } old_mousehw_t; typedef struct old_mousemode { - int protocol; - int rate; - int resolution; - int accelfactor; + int protocol; + int rate; + int resolution; + int accelfactor; } old_mousemode_t; /* packet formatting function */ -typedef int packetfunc_t(struct psm_softc *, unsigned char *, - int *, int, mousestatus_t *); +typedef int packetfunc_t(struct psm_softc *, u_char *, int *, int, + mousestatus_t *); /* function prototypes */ -static void psmidentify(driver_t *, device_t); -static int psmprobe(device_t); -static int psmattach(device_t); -static int psmdetach(device_t); -static int psmresume(device_t); +static void psmidentify(driver_t *, device_t); +static int psmprobe(device_t); +static int psmattach(device_t); +static int psmdetach(device_t); +static int psmresume(device_t); -static d_open_t psmopen; -static d_close_t psmclose; -static d_read_t psmread; -static d_ioctl_t psmioctl; -static d_poll_t psmpoll; +static d_open_t psmopen; +static d_close_t psmclose; +static d_read_t psmread; +static d_write_t psmwrite; +static d_ioctl_t psmioctl; +static d_poll_t psmpoll; -static int enable_aux_dev(KBDC); -static int disable_aux_dev(KBDC); -static int get_mouse_status(KBDC, int *, int, int); -static int get_aux_id(KBDC); -static int set_mouse_sampling_rate(KBDC, int); -static int set_mouse_scaling(KBDC, int); -static int set_mouse_resolution(KBDC, int); -static int set_mouse_mode(KBDC); -static int get_mouse_buttons(KBDC); -static int is_a_mouse(int); -static void recover_from_error(KBDC); -static int restore_controller(KBDC, int); -static int doinitialize(struct psm_softc *, mousemode_t *); -static int doopen(struct psm_softc *, int); -static int reinitialize(struct psm_softc *, int); -static char *model_name(int); -static void psmsoftintr(void *); -static void psmintr(void *); -static void psmtimeout(void *); -static int timeelapsed(const struct timeval *, - int, int, const struct timeval *); -static void dropqueue(struct psm_softc *); -static void flushpackets(struct psm_softc *); +static int enable_aux_dev(KBDC); +static int disable_aux_dev(KBDC); +static int get_mouse_status(KBDC, int *, int, int); +static int get_aux_id(KBDC); +static int set_mouse_sampling_rate(KBDC, int); +static int set_mouse_scaling(KBDC, int); +static int set_mouse_resolution(KBDC, int); +static int set_mouse_mode(KBDC); +static int get_mouse_buttons(KBDC); +static int is_a_mouse(int); +static void recover_from_error(KBDC); +static int restore_controller(KBDC, int); +static int doinitialize(struct psm_softc *, mousemode_t *); +static int doopen(struct psm_softc *, int); +static int reinitialize(struct psm_softc *, int); +static char *model_name(int); +static void psmsoftintr(void *); +static void psmintr(void *); +static void psmtimeout(void *); +static int timeelapsed(const struct timeval *, int, int, + const struct timeval *); +static void dropqueue(struct psm_softc *); +static void flushpackets(struct psm_softc *); +static void proc_mmanplus(struct psm_softc *, packetbuf_t *, + mousestatus_t *, int *, int *, int *); +static int proc_synaptics(struct psm_softc *, packetbuf_t *, + mousestatus_t *, int *, int *, int *); +static void proc_versapad(struct psm_softc *, packetbuf_t *, + mousestatus_t *, int *, int *, int *); +static int tame_mouse(struct psm_softc *, packetbuf_t *, mousestatus_t *, + u_char *); /* vendor specific features */ -typedef int probefunc_t(struct psm_softc *); +typedef int probefunc_t(struct psm_softc *); + +static int mouse_id_proc1(KBDC, int, int, int *); +static int mouse_ext_command(KBDC, int); -static int mouse_id_proc1(KBDC, int, int, int *); -static int mouse_ext_command(KBDC, int); -static probefunc_t enable_groller; -static probefunc_t enable_gmouse; -static probefunc_t enable_aglide; -static probefunc_t enable_kmouse; -static probefunc_t enable_msexplorer; -static probefunc_t enable_msintelli; -static probefunc_t enable_4dmouse; -static probefunc_t enable_4dplus; -static probefunc_t enable_mmanplus; -static probefunc_t enable_synaptics; -static probefunc_t enable_versapad; -static int tame_mouse(struct psm_softc *, packetbuf_t *, mousestatus_t *, unsigned char *); +static probefunc_t enable_groller; +static probefunc_t enable_gmouse; +static probefunc_t enable_aglide; +static probefunc_t enable_kmouse; +static probefunc_t enable_msexplorer; +static probefunc_t enable_msintelli; +static probefunc_t enable_4dmouse; +static probefunc_t enable_4dplus; +static probefunc_t enable_mmanplus; +static probefunc_t enable_synaptics; +static probefunc_t enable_versapad; static struct { - int model; - unsigned char syncmask; - int packetsize; - probefunc_t *probefunc; + int model; + u_char syncmask; + int packetsize; + probefunc_t *probefunc; } vendortype[] = { - /* - * WARNING: the order of probe is very important. Don't mess it - * unless you know what you are doing. - */ - { MOUSE_MODEL_NET, /* Genius NetMouse */ - 0x08, MOUSE_PS2INTELLI_PACKETSIZE, enable_gmouse, }, - { MOUSE_MODEL_NETSCROLL, /* Genius NetScroll */ - 0xc8, 6, enable_groller, }, - { MOUSE_MODEL_MOUSEMANPLUS, /* Logitech MouseMan+ */ - 0x08, MOUSE_PS2_PACKETSIZE, enable_mmanplus, }, - { MOUSE_MODEL_EXPLORER, /* Microsoft IntelliMouse Explorer */ - 0x08, MOUSE_PS2INTELLI_PACKETSIZE, enable_msexplorer, }, - { MOUSE_MODEL_4D, /* A4 Tech 4D Mouse */ - 0x08, MOUSE_4D_PACKETSIZE, enable_4dmouse, }, - { MOUSE_MODEL_4DPLUS, /* A4 Tech 4D+ Mouse */ - 0xc8, MOUSE_4DPLUS_PACKETSIZE, enable_4dplus, }, - { MOUSE_MODEL_INTELLI, /* Microsoft IntelliMouse */ - 0x08, MOUSE_PS2INTELLI_PACKETSIZE, enable_msintelli, }, - { MOUSE_MODEL_GLIDEPOINT, /* ALPS GlidePoint */ - 0xc0, MOUSE_PS2_PACKETSIZE, enable_aglide, }, - { MOUSE_MODEL_THINK, /* Kensington ThinkingMouse */ - 0x80, MOUSE_PS2_PACKETSIZE, enable_kmouse, }, - { MOUSE_MODEL_VERSAPAD, /* Interlink electronics VersaPad */ - 0xe8, MOUSE_PS2VERSA_PACKETSIZE, enable_versapad, }, - { MOUSE_MODEL_SYNAPTICS, /* Synaptics Touchpad */ - 0xc0, MOUSE_SYNAPTICS_PACKETSIZE, enable_synaptics, }, - { MOUSE_MODEL_GENERIC, - 0xc0, MOUSE_PS2_PACKETSIZE, NULL, }, + /* + * WARNING: the order of probe is very important. Don't mess it + * unless you know what you are doing. + */ + { MOUSE_MODEL_NET, /* Genius NetMouse */ + 0x08, MOUSE_PS2INTELLI_PACKETSIZE, enable_gmouse }, + { MOUSE_MODEL_NETSCROLL, /* Genius NetScroll */ + 0xc8, 6, enable_groller }, + { MOUSE_MODEL_MOUSEMANPLUS, /* Logitech MouseMan+ */ + 0x08, MOUSE_PS2_PACKETSIZE, enable_mmanplus }, + { MOUSE_MODEL_EXPLORER, /* Microsoft IntelliMouse Explorer */ + 0x08, MOUSE_PS2INTELLI_PACKETSIZE, enable_msexplorer }, + { MOUSE_MODEL_4D, /* A4 Tech 4D Mouse */ + 0x08, MOUSE_4D_PACKETSIZE, enable_4dmouse }, + { MOUSE_MODEL_4DPLUS, /* A4 Tech 4D+ Mouse */ + 0xc8, MOUSE_4DPLUS_PACKETSIZE, enable_4dplus }, + { MOUSE_MODEL_INTELLI, /* Microsoft IntelliMouse */ + 0x08, MOUSE_PS2INTELLI_PACKETSIZE, enable_msintelli }, + { MOUSE_MODEL_GLIDEPOINT, /* ALPS GlidePoint */ + 0xc0, MOUSE_PS2_PACKETSIZE, enable_aglide }, + { MOUSE_MODEL_THINK, /* Kensington ThinkingMouse */ + 0x80, MOUSE_PS2_PACKETSIZE, enable_kmouse }, + { MOUSE_MODEL_VERSAPAD, /* Interlink electronics VersaPad */ + 0xe8, MOUSE_PS2VERSA_PACKETSIZE, enable_versapad }, + { MOUSE_MODEL_SYNAPTICS, /* Synaptics Touchpad */ + 0xc0, MOUSE_SYNAPTICS_PACKETSIZE, enable_synaptics }, + { MOUSE_MODEL_GENERIC, + 0xc0, MOUSE_PS2_PACKETSIZE, NULL }, }; -#define GENERIC_MOUSE_ENTRY ((sizeof(vendortype) / sizeof(*vendortype)) - 1) +#define GENERIC_MOUSE_ENTRY \ + ((sizeof(vendortype) / sizeof(*vendortype)) - 1) /* device driver declarateion */ static device_method_t psm_methods[] = { @@ -385,18 +396,18 @@ }; static driver_t psm_driver = { - PSM_DRIVER_NAME, - psm_methods, - sizeof(struct psm_softc), + PSM_DRIVER_NAME, + psm_methods, + sizeof(struct psm_softc), }; - static struct cdevsw psm_cdevsw = { .d_version = D_VERSION, .d_flags = D_NEEDGIANT, .d_open = psmopen, .d_close = psmclose, .d_read = psmread, + .d_write = psmwrite, .d_ioctl = psmioctl, .d_poll = psmpoll, .d_name = PSM_DRIVER_NAME, @@ -406,123 +417,123 @@ static int enable_aux_dev(KBDC kbdc) { - int res; + int res; - res = send_aux_command(kbdc, PSMC_ENABLE_DEV); - VLOG(2, (LOG_DEBUG, "psm: ENABLE_DEV return code:%04x\n", res)); + res = send_aux_command(kbdc, PSMC_ENABLE_DEV); + VLOG(2, (LOG_DEBUG, "psm: ENABLE_DEV return code:%04x\n", res)); - return (res == PSM_ACK); + return (res == PSM_ACK); } static int disable_aux_dev(KBDC kbdc) { - int res; + int res; - res = send_aux_command(kbdc, PSMC_DISABLE_DEV); - VLOG(2, (LOG_DEBUG, "psm: DISABLE_DEV return code:%04x\n", res)); + res = send_aux_command(kbdc, PSMC_DISABLE_DEV); + VLOG(2, (LOG_DEBUG, "psm: DISABLE_DEV return code:%04x\n", res)); - return (res == PSM_ACK); + return (res == PSM_ACK); } static int get_mouse_status(KBDC kbdc, int *status, int flag, int len) { - int cmd; - int res; - int i; + int cmd; + int res; + int i; - switch (flag) { - case 0: - default: - cmd = PSMC_SEND_DEV_STATUS; - break; - case 1: - cmd = PSMC_SEND_DEV_DATA; - break; - } - empty_aux_buffer(kbdc, 5); - res = send_aux_command(kbdc, cmd); - VLOG(2, (LOG_DEBUG, "psm: SEND_AUX_DEV_%s return code:%04x\n", - (flag == 1) ? "DATA" : "STATUS", res)); - if (res != PSM_ACK) - return 0; + switch (flag) { + case 0: + default: + cmd = PSMC_SEND_DEV_STATUS; + break; + case 1: + cmd = PSMC_SEND_DEV_DATA; + break; + } + empty_aux_buffer(kbdc, 5); + res = send_aux_command(kbdc, cmd); + VLOG(2, (LOG_DEBUG, "psm: SEND_AUX_DEV_%s return code:%04x\n", + (flag == 1) ? "DATA" : "STATUS", res)); + if (res != PSM_ACK) + return (0); - for (i = 0; i < len; ++i) { - status[i] = read_aux_data(kbdc); - if (status[i] < 0) - break; - } + for (i = 0; i < len; ++i) { + status[i] = read_aux_data(kbdc); + if (status[i] < 0) + break; + } - VLOG(1, (LOG_DEBUG, "psm: %s %02x %02x %02x\n", - (flag == 1) ? "data" : "status", status[0], status[1], status[2])); + VLOG(1, (LOG_DEBUG, "psm: %s %02x %02x %02x\n", + (flag == 1) ? "data" : "status", status[0], status[1], status[2])); - return i; + return (i); } static int get_aux_id(KBDC kbdc) { - int res; - int id; + int res; + int id; - empty_aux_buffer(kbdc, 5); - res = send_aux_command(kbdc, PSMC_SEND_DEV_ID); - VLOG(2, (LOG_DEBUG, "psm: SEND_DEV_ID return code:%04x\n", res)); - if (res != PSM_ACK) - return (-1); + empty_aux_buffer(kbdc, 5); + res = send_aux_command(kbdc, PSMC_SEND_DEV_ID); + VLOG(2, (LOG_DEBUG, "psm: SEND_DEV_ID return code:%04x\n", res)); + if (res != PSM_ACK) + return (-1); - /* 10ms delay */ - DELAY(10000); + /* 10ms delay */ + DELAY(10000); - id = read_aux_data(kbdc); - VLOG(2, (LOG_DEBUG, "psm: device ID: %04x\n", id)); + id = read_aux_data(kbdc); + VLOG(2, (LOG_DEBUG, "psm: device ID: %04x\n", id)); - return id; + return (id); } static int set_mouse_sampling_rate(KBDC kbdc, int rate) { - int res; + int res; - res = send_aux_command_and_data(kbdc, PSMC_SET_SAMPLING_RATE, rate); - VLOG(2, (LOG_DEBUG, "psm: SET_SAMPLING_RATE (%d) %04x\n", rate, res)); + res = send_aux_command_and_data(kbdc, PSMC_SET_SAMPLING_RATE, rate); + VLOG(2, (LOG_DEBUG, "psm: SET_SAMPLING_RATE (%d) %04x\n", rate, res)); - return ((res == PSM_ACK) ? rate : -1); + return ((res == PSM_ACK) ? rate : -1); } static int set_mouse_scaling(KBDC kbdc, int scale) { - int res; + int res; - switch (scale) { - case 1: - default: - scale = PSMC_SET_SCALING11; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 9 05:52:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5417F1065677; Wed, 9 Apr 2008 05:52:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1623E1065672 for ; Wed, 9 Apr 2008 05:52:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 060998FC20 for ; Wed, 9 Apr 2008 05:52:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m395qfD3047352 for ; Wed, 9 Apr 2008 05:52:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m395qfo8047350 for perforce@freebsd.org; Wed, 9 Apr 2008 05:52:41 GMT (envelope-from sam@freebsd.org) Date: Wed, 9 Apr 2008 05:52:41 GMT Message-Id: <200804090552.m395qfo8047350@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 Cc: Subject: PERFORCE change 139636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2008 05:52:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=139636 Change 139636 by sam@sam_ebb on 2008/04/09 05:52:15 auto-load dependent wlan modules Affected files ... .. //depot/projects/vap/etc/rc.d/hostapd#3 edit .. //depot/projects/vap/etc/rc.d/wpa_supplicant#7 edit Differences ... ==== //depot/projects/vap/etc/rc.d/hostapd#3 (text+ko) ==== @@ -18,6 +18,7 @@ command_args="-P ${pidfile} -B ${conf_file}" required_files="${conf_file}" +required_modules="wlan_xauth wlan_wep wlan_tkip wlan_ccmp" extra_commands="reload" load_rc_config ${name} ==== //depot/projects/vap/etc/rc.d/wpa_supplicant#7 (text+ko) ==== @@ -50,5 +50,6 @@ pidfile="/var/run/${name}/${ifn}.pid" command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file +required_modules="wlan_wep wlan_tkip wlan_ccmp" run_rc_command "$1" From owner-p4-projects@FreeBSD.ORG Wed Apr 9 05:55:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 625941065671; Wed, 9 Apr 2008 05:55:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24853106566B for ; Wed, 9 Apr 2008 05:55:46 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1434E8FC14 for ; Wed, 9 Apr 2008 05:55:46 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m395tj7K047448 for ; Wed, 9 Apr 2008 05:55:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m395tjbk047446 for perforce@freebsd.org; Wed, 9 Apr 2008 05:55:45 GMT (envelope-from sam@freebsd.org) Date: Wed, 9 Apr 2008 05:55:45 GMT Message-Id: <200804090555.m395tjbk047446@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 Cc: Subject: PERFORCE change 139637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2008 05:55:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=139637 Change 139637 by sam@sam_ebb on 2008/04/09 05:55:32 o roll wlan_scan_sta into the wlan module/device; with ap mode scanning already integrated there's little reason to not bundle this stuff (if someone wants a stripped down system we'll need to do more careful splitting and revisit the need to demand-load modules) o cleanup some files cruft in the vacinity Affected files ... .. //depot/projects/vap/sys/conf/files#29 edit .. //depot/projects/vap/sys/modules/Makefile#18 edit .. //depot/projects/vap/sys/modules/wlan/Makefile#8 edit .. //depot/projects/vap/sys/modules/wlan_scan_sta/Makefile#4 delete Differences ... ==== //depot/projects/vap/sys/conf/files#29 (text+ko) ==== @@ -1688,13 +1688,13 @@ net/zlib.c optional crypto | geom_uzip | ipsec | \ mxge | ppp_deflate | netgraph_deflate net80211/ieee80211.c optional wlan -net80211/ieee80211_acl.c optional wlan wlan_acl +net80211/ieee80211_acl.c optional wlan_acl net80211/ieee80211_adhoc.c optional wlan -net80211/ieee80211_amrr.c optional wlan wlan_amrr +net80211/ieee80211_amrr.c optional wlan_amrr net80211/ieee80211_crypto.c optional wlan -net80211/ieee80211_crypto_ccmp.c optional wlan wlan_ccmp +net80211/ieee80211_crypto_ccmp.c optional wlan_ccmp net80211/ieee80211_crypto_none.c optional wlan -net80211/ieee80211_crypto_tkip.c optional wlan wlan_tkip +net80211/ieee80211_crypto_tkip.c optional wlan_tkip net80211/ieee80211_crypto_wep.c optional wlan_wep net80211/ieee80211_ddb.c optional wlan ddb net80211/ieee80211_dfs.c optional wlan @@ -1710,12 +1710,12 @@ net80211/ieee80211_power.c optional wlan net80211/ieee80211_proto.c optional wlan net80211/ieee80211_regdomain.c optional wlan -net80211/ieee80211_rssadapt.c optional wlan wlan_rssadapt +net80211/ieee80211_rssadapt.c optional wlan_rssadapt net80211/ieee80211_scan.c optional wlan -net80211/ieee80211_scan_sta.c optional wlan wlan_scan_sta +net80211/ieee80211_scan_sta.c optional wlan net80211/ieee80211_sta.c optional wlan net80211/ieee80211_wds.c optional wlan -net80211/ieee80211_xauth.c optional wlan wlan_xauth +net80211/ieee80211_xauth.c optional wlan_xauth netatalk/aarp.c optional netatalk netatalk/at_control.c optional netatalk netatalk/at_proto.c optional netatalk ==== //depot/projects/vap/sys/modules/Makefile#18 (text+ko) ==== @@ -314,7 +314,6 @@ wlan_amrr \ wlan_ccmp \ wlan_rssadapt \ - wlan_scan_sta \ wlan_tkip \ wlan_wep \ wlan_xauth \ ==== //depot/projects/vap/sys/modules/wlan/Makefile#8 (text+ko) ==== @@ -6,8 +6,8 @@ SRCS= ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \ ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \ ieee80211_node.c ieee80211_output.c ieee80211_phy.c ieee80211_power.c \ - ieee80211_proto.c ieee80211_scan.c ieee80211_regdomain.c \ - ieee80211_ht.c \ + ieee80211_proto.c ieee80211_scan.c ieee80211_scan_sta.c \ + ieee80211_regdomain.c ieee80211_ht.c \ ieee80211_adhoc.c ieee80211_hostap.c ieee80211_monitor.c \ ieee80211_sta.c ieee80211_wds.c SRCS+= bus_if.h device_if.h opt_inet.h opt_ipx.h opt_wlan.h From owner-p4-projects@FreeBSD.ORG Wed Apr 9 18:12:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDAF41065671; Wed, 9 Apr 2008 18:12:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FE0D106566C for ; Wed, 9 Apr 2008 18:12:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D9A48FC14 for ; Wed, 9 Apr 2008 18:12:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m39ICqUR077277 for ; Wed, 9 Apr 2008 18:12:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m39ICqcM077275 for perforce@freebsd.org; Wed, 9 Apr 2008 18:12:52 GMT (envelope-from sam@freebsd.org) Date: Wed, 9 Apr 2008 18:12:52 GMT Message-Id: <200804091812.m39ICqcM077275@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 Cc: Subject: PERFORCE change 139670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2008 18:12:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=139670 Change 139670 by sam@sam_ebb on 2008/04/09 18:12:14 IFC @ 139669 Affected files ... .. //depot/projects/vap/sys/boot/i386/pxeldr/pxeldr.S#6 integrate .. //depot/projects/vap/sys/compat/linux/linux_file.c#9 integrate .. //depot/projects/vap/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/vap/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/vap/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/vap/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/vap/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/vap/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/vap/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/vap/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/vap/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/vap/usr.sbin/pkg_install/Makefile#5 integrate Differences ... ==== //depot/projects/vap/sys/boot/i386/pxeldr/pxeldr.S#6 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.S,v 1.16 2008/03/06 21:43:56 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.S,v 1.17 2008/04/09 17:59:17 jhb Exp $ */ /* @@ -117,13 +117,11 @@ #ifdef PROBE_KEYBOARD /* * Look at the BIOS data area to see if we have an enhanced keyboard. If not, - * set the RBX_SERIAL bit in the howto byte to prefer the serial console to - * the video console. + * set the RBX_DUAL and RBX_SERIAL bits in the howto byte. */ - orl $RB_MULTIPLE, (%bx) # enable multiple consoles testb $KEYBOARD_BIT, MEM_BIOS_KEYBOARD # keyboard present? jnz keyb # yes, so skip - orl $RB_SERIAL, (%bx) # prefer serial console + orl $(RB_MULTIPLE | RB_SERIAL), (%bx) # enable serial console keyb: #endif /* ==== //depot/projects/vap/sys/compat/linux/linux_file.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.111 2008/04/08 09:45:47 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.112 2008/04/09 16:42:50 rdivacky Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -131,10 +131,8 @@ bsd_flags |= O_NOFOLLOW; /* XXX LINUX_O_NOATIME: unable to be easily implemented. */ - if (dirfd != -1) - error = kern_openat(td, dirfd, path, UIO_SYSSPACE, bsd_flags, mode); - else - error = kern_open(td, path, UIO_SYSSPACE, bsd_flags, mode); + error = kern_openat(td, dirfd, path, UIO_SYSSPACE, bsd_flags, mode); + if (!error) { fd = td->td_retval[0]; /* @@ -215,7 +213,7 @@ path, args->flags, args->mode); #endif - return (linux_common_open(td, -1, path, args->flags, args->mode)); + return (linux_common_open(td, AT_FDCWD, path, args->flags, args->mode)); } int ==== //depot/projects/vap/sys/nlm/nlm_prot_impl.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/nlm/nlm_prot_impl.c,v 1.3 2008/03/28 09:50:32 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/nlm/nlm_prot_impl.c,v 1.4 2008/04/09 15:43:19 dfr Exp $"); #include #include @@ -1075,7 +1075,7 @@ { struct thread *td = curthread; int error; - SVCPOOL *pool; + SVCPOOL *pool = NULL; struct sockopt opt; int portlow; #ifdef INET6 @@ -1137,7 +1137,7 @@ #endif memset(&sin, 0, sizeof(sin)); sin.sin_len = sizeof(sin); - sin.sin_family = AF_INET6; + sin.sin_family = AF_INET; sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); nlm_nsm = nlm_get_rpc((struct sockaddr *) &sin, SM_PROG, SM_VERS); @@ -1147,7 +1147,8 @@ if (!nlm_nsm) { printf("Can't start NLM - unable to contact NSM\n"); - return (EINVAL); + error = EINVAL; + goto out; } pool = svcpool_create(); ==== //depot/projects/vap/sys/powerpc/fpu/fpu_add.c#2 (text+ko) ==== @@ -47,10 +47,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_add.c,v 1.2 2008/02/24 03:01:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_add.c,v 1.3 2008/04/09 08:50:37 grehan Exp $"); +#include #include -#include #include #include ==== //depot/projects/vap/sys/powerpc/fpu/fpu_compare.c#2 (text+ko) ==== @@ -48,10 +48,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_compare.c,v 1.1 2008/02/23 20:05:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_compare.c,v 1.2 2008/04/09 08:50:37 grehan Exp $"); +#include #include -#include #include #include ==== //depot/projects/vap/sys/powerpc/fpu/fpu_div.c#2 (text+ko) ==== @@ -45,10 +45,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_div.c,v 1.1 2008/02/23 20:05:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_div.c,v 1.2 2008/04/09 08:50:37 grehan Exp $"); +#include #include -#include #include #include ==== //depot/projects/vap/sys/powerpc/fpu/fpu_explode.c#2 (text+ko) ==== @@ -46,10 +46,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_explode.c,v 1.1 2008/02/23 20:05:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_explode.c,v 1.2 2008/04/09 08:50:37 grehan Exp $"); +#include #include -#include #include #include ==== //depot/projects/vap/sys/powerpc/fpu/fpu_implode.c#2 (text+ko) ==== @@ -46,10 +46,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_implode.c,v 1.1 2008/02/23 20:05:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_implode.c,v 1.2 2008/04/09 08:50:37 grehan Exp $"); +#include #include -#include #include #include ==== //depot/projects/vap/sys/powerpc/fpu/fpu_mul.c#2 (text+ko) ==== @@ -45,10 +45,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_mul.c,v 1.1 2008/02/23 20:05:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_mul.c,v 1.2 2008/04/09 08:50:37 grehan Exp $"); +#include #include -#include #include #include ==== //depot/projects/vap/sys/powerpc/fpu/fpu_sqrt.c#2 (text+ko) ==== @@ -45,10 +45,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_sqrt.c,v 1.1 2008/02/23 20:05:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_sqrt.c,v 1.2 2008/04/09 08:50:37 grehan Exp $"); +#include #include -#include #include #include ==== //depot/projects/vap/sys/powerpc/fpu/fpu_subr.c#2 (text+ko) ==== @@ -45,10 +45,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_subr.c,v 1.2 2008/02/24 03:01:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_subr.c,v 1.3 2008/04/09 08:50:37 grehan Exp $"); +#include #include -#include #include #include ==== //depot/projects/vap/usr.sbin/pkg_install/Makefile#5 (text+ko) ==== @@ -1,7 +1,23 @@ -# $FreeBSD: src/usr.sbin/pkg_install/Makefile,v 1.21 2008/03/31 12:45:17 flz Exp $ +# $FreeBSD: src/usr.sbin/pkg_install/Makefile,v 1.22 2008/04/09 15:08:31 flz Exp $ .include SUBDIR= lib add create delete info updating version .include + +CP= /bin/cp +RM= /bin/rm +TAR= /usr/bin/tar + +DATE!= date +%Y%m%d + +distfile: clean + @(cd ${.CURDIR}/..; \ + ${CP} -r pkg_install pkg_install-${DATE}; \ + ${TAR} -czf pkg_install/pkg_install-${DATE}.tar.gz \ + --exclude .#* --exclude *~ --exclude CVS \ + --exclude pkg_install-*.tar.gz pkg_install-${DATE}; \ + ${RM} -rf pkg_install-${DATE}) + + From owner-p4-projects@FreeBSD.ORG Wed Apr 9 21:27:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 228891065674; Wed, 9 Apr 2008 21:27:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D847C106566B for ; Wed, 9 Apr 2008 21:27:16 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C69F48FC19 for ; Wed, 9 Apr 2008 21:27:16 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m39LRG0K021820 for ; Wed, 9 Apr 2008 21:27:16 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m39LRG9g021818 for perforce@freebsd.org; Wed, 9 Apr 2008 21:27:16 GMT (envelope-from piso@freebsd.org) Date: Wed, 9 Apr 2008 21:27:16 GMT Message-Id: <200804092127.m39LRG9g021818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 139684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2008 21:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=139684 Change 139684 by piso@piso_newluxor on 2008/04/09 21:26:47 -move around debug code. -remove a bogus check. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#8 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#76 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#8 (text+ko) ==== @@ -259,7 +259,8 @@ NULL) goto badnat; ip = mtod(m, struct ip *); - printf("%s()::%d - ip->ip_off: %d\n", __FUNCTION__, __LINE__, ip->ip_off); + printf("%s()::%d - ip_off: %d ip_len: %d mlen: %d\n", __FUNCTION__, __LINE__, + ip->ip_off, ip->ip_len, m->m_len); if (ip->ip_off & (IP_MF | IP_OFFMASK)) { struct mbuf *reass; @@ -347,7 +348,6 @@ CSUM_DELAY_DATA) ldt = 1; - printf("bef ip_len: %d ip_hl: %d\n", ntohs(ip->ip_len), ip->ip_hl); if (args->oif == NULL) retval = LibAliasIn(t->lib, &m, MCLBYTES); @@ -355,10 +355,6 @@ retval = LibAliasOut(t->lib, &m, MCLBYTES); if (retval != PKT_ALIAS_OK) { - if (retval & - (PKT_ALIAS_FOUND_HEADER_FRAGMENT | - PKT_ALIAS_UNRESOLVED_FRAGMENT)) - printf("fragment in libalias?!?!\n"); // XXX panic?!?! printf("retval: %d", retval); /* XXX - should i add some logging? */ m_free(m); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#76 (text+ko) ==== @@ -282,7 +282,6 @@ IcmpAliasIn1(struct libalias *la, struct ip *pip, struct icmp *ic) { - printf("%s\n", __FUNCTION__); LIBALIAS_LOCK_ASSERT(la); /* De-alias incoming echo and timestamp replies. @@ -325,7 +324,6 @@ IcmpAliasIn2(struct libalias *la, pkt_t ptr) { - printf("%s\n", __FUNCTION__); LIBALIAS_LOCK_ASSERT(la); /* Alias incoming ICMP error messages containing @@ -432,7 +430,6 @@ struct ip *pip; struct icmp *ic; - printf("%s\n", __FUNCTION__); LIBALIAS_LOCK_ASSERT(la); /* Return if proxy-only mode is enabled */ if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY) @@ -1258,7 +1255,7 @@ struct ip *pip; int iresult; - printf("%s\n", __FUNCTION__); + printf("%s()::%d\n", __FUNCTION__, __LINE__); if (la->packetAliasMode & PKT_ALIAS_REVERSE) { la->packetAliasMode &= ~PKT_ALIAS_REVERSE; iresult = LibAliasOutLocked(la, ptr, maxpacketsize, 1); @@ -1273,27 +1270,20 @@ /* Defense against mangled packets */ if (ntohs(pip->ip_len) > maxpacketsize || (pip->ip_hl << 2) > maxpacketsize) { - printf("%d\n", __LINE__); - printf("maxpktsize: %d ip_len: %d ip_hl: %d\n", maxpacketsize, - ntohs(pip->ip_len), pip->ip_hl); iresult = PKT_ALIAS_IGNORED; goto getout; } iresult = PKT_ALIAS_IGNORED; if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0) { - printf("%s()::%d - ip->ip_off: %d\n", __FUNCTION__, __LINE__, pip->ip_off); switch (pip->ip_p) { case IPPROTO_ICMP: - printf("%d\n", __LINE__); iresult = IcmpAliasIn(la, ptr); break; case IPPROTO_UDP: - printf("%d\n", __LINE__); iresult = UdpAliasIn(la, ptr); break; case IPPROTO_TCP: - printf("%d\n", __LINE__); iresult = TcpAliasIn(la, ptr); break; case IPPROTO_GRE: { @@ -1318,7 +1308,6 @@ } break; default: - printf("%d\n", __LINE__); iresult = ProtoAliasIn(la, pip->ip_src, &pip->ip_dst, pip->ip_p, &pip->ip_sum); break; @@ -1328,7 +1317,6 @@ if (ntohs(pip->ip_off) & IP_MF) { struct alias_link *lnk; - printf("%s()::%d - ip->ip_off: %d\n", __FUNCTION__, __LINE__, pip->ip_off); lnk = FindFragmentIn1(la, pip->ip_src, alias_addr, pip->ip_id); if (lnk != NULL) { iresult = PKT_ALIAS_FOUND_HEADER_FRAGMENT; @@ -1338,7 +1326,6 @@ } } } else { - printf("%s()::%d - ip->ip_off: %d\n", __FUNCTION__, __LINE__, pip->ip_off); iresult = FragmentIn(la, pip->ip_src, &pip->ip_dst, pip->ip_id, &pip->ip_sum); } @@ -1396,6 +1383,7 @@ struct in_addr addr_save; struct ip *pip; + printf("%s()::%d\n", __FUNCTION__, __LINE__); if (la->packetAliasMode & PKT_ALIAS_REVERSE) { la->packetAliasMode &= ~PKT_ALIAS_REVERSE; iresult = LibAliasInLocked(la, ptr, maxpacketsize); From owner-p4-projects@FreeBSD.ORG Wed Apr 9 23:11:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 547641065675; Wed, 9 Apr 2008 23:11:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14A6A106566C for ; Wed, 9 Apr 2008 23:11:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 012238FC18 for ; Wed, 9 Apr 2008 23:11:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m39NB8fE047970 for ; Wed, 9 Apr 2008 23:11:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m39NB8Zj047968 for perforce@freebsd.org; Wed, 9 Apr 2008 23:11:08 GMT (envelope-from jb@freebsd.org) Date: Wed, 9 Apr 2008 23:11:08 GMT Message-Id: <200804092311.m39NB8Zj047968@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 139687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2008 23:11:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=139687 Change 139687 by jb@jb_freebsd1 on 2008/04/09 23:10:25 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#15 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#64 integrate .. //depot/projects/dtrace/doc/share/sgml/mirrors.xml#12 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#25 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/faq/book.sgml#9 integrate .. //depot/projects/dtrace/ports/MOVED#75 integrate .. //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#10 integrate .. //depot/projects/dtrace/ports/UPDATING#65 integrate .. //depot/projects/dtrace/src/UPDATING#28 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#30 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#17 integrate .. //depot/projects/dtrace/src/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/dtrace/src/etc/rc.d/wpa_supplicant#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#10 integrate .. //depot/projects/dtrace/src/release/ia64/mkisoimages.sh#4 integrate .. //depot/projects/dtrace/src/sbin/gpt/gpt.c#8 integrate .. //depot/projects/dtrace/src/share/man/man4/asmc.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/bpf.4#6 integrate .. //depot/projects/dtrace/src/share/man/man4/psm.4#4 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#27 integrate .. //depot/projects/dtrace/src/share/mk/bsd.lib.mk#14 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#39 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux.h#10 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_dummy.c#10 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_proto.h#16 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_syscall.h#16 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysent.c#16 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysvec.c#12 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/syscalls.master#15 integrate .. //depot/projects/dtrace/src/sys/arm/arm/exception.S#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/locore.S#7 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#13 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/ep80219_machdep.c#9 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#14 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/dtrace/src/sys/boot/i386/pxeldr/pxeldr.S#7 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#15 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#23 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#12 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_util.c#8 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_util.h#6 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/atkbdc/psm.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#26 integrate .. //depot/projects/dtrace/src/sys/dev/ral/rt2661.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci_pci.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ubsa.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#29 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#35 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_util.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux.h#9 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_dummy.c#10 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_proto.h#18 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_syscall.h#17 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_sysent.c#17 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_sysvec.c#11 integrate .. //depot/projects/dtrace/src/sys/i386/linux/syscalls.master#17 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/sscdisk.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#24 integrate .. //depot/projects/dtrace/src/sys/kern/subr_firmware.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_cache.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#30 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#23 integrate .. //depot/projects/dtrace/src/sys/modules/asmc/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/net/bpf.c#19 integrate .. //depot/projects/dtrace/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/dtrace/src/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/dtrace/src/sys/net/if_loop.c#10 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#20 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_input.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_ipsec.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_ipsec.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/sc_machdep.h#4 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/syscons_cbus.c#8 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/include/atomic.h#9 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/intr_machdep.h#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/smp.h#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/intr_machdep.c#9 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/mp_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/sys/eventhandler.h#10 integrate .. //depot/projects/dtrace/src/sys/sys/kernel.h#20 integrate .. //depot/projects/dtrace/src/sys/sys/lockmgr.h#20 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#48 integrate .. //depot/projects/dtrace/src/sys/sys/syscallsubr.h#12 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_gjournal.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/Makefile#7 integrate .. //depot/projects/dtrace/src/usr.sbin/rpc.statd/statd.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/devices.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/menus.c#12 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#28 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#21 integrate .. //depot/projects/dtrace/www/en/gnome/docs/halfaq.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/images/Makefile#11 integrate .. //depot/projects/dtrace/www/en/gnome/images/ss222-4-tn.png#1 branch .. //depot/projects/dtrace/www/en/gnome/images/ss222-4.png#1 branch .. //depot/projects/dtrace/www/en/gnome/screenshots.sgml#12 integrate .. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#18 integrate .. //depot/projects/dtrace/www/en/search/index-site.sgml#4 integrate .. //depot/projects/dtrace/www/en/search/search-mid.sgml#4 integrate .. //depot/projects/dtrace/www/en/search/search.sgml#7 integrate .. //depot/projects/dtrace/www/en/search/searchhints.sgml#4 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4462,7 +4462,7 @@ A default Samba configuration file is installed as - /usr/local/share/examples/smb.conf.default. This + /usr/local/share/examples/samba/smb.conf.default. This file must be copied to /usr/local/etc/smb.conf and customized before Samba can be used. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#64 (text+ko) ==== @@ -1,7 +1,7 @@ - tcl80* - Ports that use Tcl version 8.0 to run. - - - - - tcl82* - Ports that use Tcl version 8.2 to run. - - - - - tcl83* - Ports that use Tcl version 8.3 to run. - - - - - tcl84* - Ports that use Tcl version 8.4 to run. - - - - textproc Text processing utilities. It does not include @@ -1883,36 +1859,6 @@ - tk80* - Ports that use Tk version 8.0 to run. - - - - - tk82* - Ports that use Tk version 8.2 to run. - - - - - tk83* - Ports that use Tk version 8.3 to run. - - - - - tk84* - Ports that use Tk version 8.4 to run. - - - - - tkstep80* - Ports that use TkSTEP version 8.0 to run. - - - - ukrainian Ukrainian language support. @@ -3287,14 +3233,14 @@ For example, RUN_DEPENDS= ${LOCALBASE}/etc/innd:${PORTSDIR}/news/inn \ - wish8.0:${PORTSDIR}/x11-toolkits/tk80 + xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr will check if the file or directory /usr/local/etc/innd exists, and build and install it from the news/inn subdirectory of the ports tree if it is not found. It will also see if an - executable called wish8.0 is in the search - path, and descend into the x11-toolkits/tk80 + executable called xmlcatmgr is in the search + path, and descend into the textproc/xmlcatmgr subdirectory of your ports tree to build and install it if it is not found. @@ -12069,6 +12015,13 @@ lockmgr_args_rw functions. 800031 + + 8.0-CURRENT after the implementation of the + openat and related syscalls, introduction of the O_EXEC + flag for the &man.open.2;, and providing the + corresponding linux compatibility syscalls. + 800032 + ==== //depot/projects/dtrace/doc/share/sgml/mirrors.xml#12 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.69 2008/02/15 12:18:12 ceri Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.70 2008/04/09 15:14:52 roberto Exp $ @@ -681,6 +681,10 @@ + cvsup1.fr.FreeBSD.org + + + cvsup2.fr.FreeBSD.org ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#25 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.913 - $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.35 2008/04/02 16:16:32 loader Exp $ + Original Revision: 1.914 + $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.36 2008/04/07 15:43:03 loader Exp $ --> 800028 - 8.0-CURRENT after reintegration of the - BUF_LOCKWAITERS function and the - addition of &man.lockmgr.waiters.9;. + ÖØÐÂÕûºÏÁË BUF_LOCKWAITERS + º¯Êý²¢¼ÓÈë &man.lockmgr.waiters.9; Ö®ºóµÄ + 8.0-CURRENT¡£ 800029 ÒýÈë &man.rw.try.rlock.9; ºÍ &man.rw.try.wlock.9; Ö®ºóµÄ 8.0-CURRENT¡£ 800030 - + + + ÒýÈë lockmgr_rw ºÍ + lockmgr_args_rw + º¯ÊýÖ®ºóµÄ 8.0-CURRENT¡£ + 800031 + ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/faq/book.sgml#9 (text+ko) ==== @@ -29,7 +29,7 @@ FreeBSD ¤å¥ó­pµe - $FreeBSD: doc/zh_TW.Big5/books/faq/book.sgml,v 1.26 2008/02/24 10:19:40 chinsan Exp $ + $FreeBSD: doc/zh_TW.Big5/books/faq/book.sgml,v 1.28 2008/04/07 17:18:45 chinsan Exp $ 1995 @@ -10414,7 +10414,7 @@ - The FreeBSD Funnies + FreeBSD §N¯º¸Ü¶° @@ -10606,6 +10606,25 @@ routing get annoyed by it as well. + + + + + 1993 ¦~´N¦³¡ymake world¡z¤F¡H + + + + °Ý¡G®Ú¾Ú jkh ªº + ³o¥÷ commit¡AÀ³¸Ó¬O Aug 13 22:47:28 1994 UTC + ¤§«á¤~·|¦³ make world¡A«ç»ò·|¦³¦b¨º¤§«e·|¦³©O¡H + + µª¡G®Ú¾Ú pttlz.bbs@ptt.cc (¤uÃÆ) ©ó Apr 7 17:09:47 2008 CST ¦ÛºÙ¡G + ¡ymake world ¬O§Ú¥j¦­ (15 ¦~«e) ®Éª± freebsd ®É¥Îªº¡z¡A©Ò¥H 1993 ¦~´N¦³ + pttlz ªº¡ymake world¡z¦s¦b¤F¡A½Ðª`·N¤H®a¥i¬O¦ÛºÙ¡y15 ¦~«e¡zªºªø½ú¡A + ½Ð¤Å¹ïªø½úÅv«Â¬D¾Ô¡AÁÂÁ¡I + + ==== //depot/projects/dtrace/ports/MOVED#75 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1569 2008/04/04 16:00:47 tabthorpe Exp $ +# $FreeBSD: ports/MOVED,v 1.1572 2008/04/09 18:40:21 ahze Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2376,7 +2376,6 @@ textproc/sed_inplace||2006-07-04|Has expired: This port is not required anymore textproc/xml4j||2006-07-04|Has expired: it has been replaced by textproc/xerces-j 8 years ago www/sitemapgen|www/google-sitemapgen|2006-07-05|Duplicate port -security/gnutls-devel||2006-07-06|Development version is not active so far www/otrs|devel/otrs|2006-07-07|Duplicate port math/UFsparse|math/ufsparse|2006-07-09|port name should not have capital letters sysutils/lineak_defaultplugin|sysutils/lineak-defaultplugin|2006-07-09|port name changed to match upstream @@ -3446,3 +3445,7 @@ x11-toolkits/qwt-devel|x11-toolkits/qwt5|2008-04-02|Renamed for better naming audio/csound-manual||2008-04-04|Merged with main port security/acid||2008-04-04|Has expired: development has ceased, use security/base +devel/check|devel/libcheck|2008-04-07|Removed in favour to devel/libcheck +archivers/deepforest||2008-04-09|Has expired: development stalled for years, outdated, unmaintained +graphics/libimg-tkstep80||2008-04-09|Has expired: tkstep80 scheduled for expiration +x11-toolkits/tkstep80||2008-04-09|Has expired: development stalled for years, outdated, unmaintained ==== //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.71 2008/01/27 14:26:42 anray Exp $ +# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.72 2008/04/07 01:18:10 rafan Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # @@ -100,7 +100,7 @@ # Emacs-22.x (development version) .elif (${EMACS_PORT_NAME} == "emacs-devel") EMACS_NAME= emacs -EMACS_VER= 23.0.50 +EMACS_VER= 23.0.60 EMACS_MAJOR_VER= 23 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} ==== //depot/projects/dtrace/ports/UPDATING#65 (text+ko) ==== @@ -6,6 +6,16 @@ time you update your ports collection, before attempting any port upgrades. +20080408: + AFFECTS: users of www/p5-Apache-Test + AUTHOR: pgollucci@p6m7g8.com + + www/p5-Apache-Test doesn't actually need www/mod_perl{1,2}. If you would + like to test a mod_perl, than please install www/mod_perl2 or www/mod_perl + as well. The ports infra structure doesn't support this(yet) but you can + use this to test both www/apache13, www/apache20 and/or www/apache22 + without chaining www/p5-Apache-Test. + 20080405: AFFECTS: users of sysutils/tracker AUTHOR: ahze@FreeBSD.org @@ -19,7 +29,7 @@ portmaster -u sysutils/tracker portupgrade users: - portupgrade -o sysutils/tracker-client tacker + portupgrade -o sysutils/tracker-client tracker portupgrade -u sysutils/tracker 20080405: @@ -131,7 +141,7 @@ 5. Install emulators/linux_base-fc6 6 Remount linprocfs (mount /compat/linux/proc) 7. Add compat.linux.osrelease=2.6.16 to etc/sysctl.conf - 8. Add OVERRIDE_LINUX_BASE_PORT=f6 to /etc/make.conf + 8. Add OVERRIDE_LINUX_BASE_PORT=fc6 to /etc/make.conf Note: These instructions also apply to linux_base-f8, please use the same osrelease. @@ -6312,4 +6322,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.613 2008/04/05 17:02:15 ahze Exp $ +$FreeBSD: ports/UPDATING,v 1.616 2008/04/08 20:55:52 beech Exp $ ==== //depot/projects/dtrace/src/UPDATING#28 (text+ko) ==== @@ -22,6 +22,13 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080408: + psm(4) has gained write(2) support in native operation level. + Arbitrary commands can be written to /dev/psm%d and status can + be read back from it. Therefore, an application is responsible + for status validation and error recovery. It is a no-op in + other operation levels. + 20080312: Support for KSE threading has been removed from the kernel. To run legacy applications linked against KSE libmap.conf may @@ -1007,4 +1014,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ +$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $ ==== //depot/projects/dtrace/src/etc/defaults/rc.conf#30 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -105,6 +105,10 @@ #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. +wpa_supplicant_program="/usr/sbin/wpa_supplicant" +wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant +wpa_supplicant_conf_file="/etc/wpa_supplicant.conf" +# firewall_enable="NO" # Set to YES to enable firewall functionality firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) @@ -379,6 +383,19 @@ bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file +rfcomm_pppd_server_enable="NO" # Enable rfcomm_pppd(8) in server mode (or NO) +rfcomm_pppd_server_profile="one two" # Profile to use from /etc/ppp/ppp.conf +# +#rfcomm_pppd_server_one_bdaddr="" # Override local bdaddr for 'one' +rfcomm_pppd_server_one_channel="1" # Override local channel for 'one' +#rfcomm_pppd_server_one_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_one_register_dun="NO" # for 'one' +# +#rfcomm_pppd_server_two_bdaddr="" # Override local bdaddr for 'two' +rfcomm_pppd_server_two_channel="3" # Override local channel for 'two' +#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_two_register_dun="NO" # for 'two' + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ==== //depot/projects/dtrace/src/etc/rc.d/Makefile#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.90 2008/04/08 23:34:12 emax Exp $ .include @@ -29,7 +29,7 @@ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - random rarpd resolv root \ + random rarpd resolv rfcomm_pppd_server root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ serial sppp statd swap1 \ ==== //depot/projects/dtrace/src/etc/rc.d/wpa_supplicant#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.2 2005/10/19 22:26:47 jkim Exp $ +# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $ # # PROVIDE: wpa_supplicant @@ -12,27 +12,43 @@ name="wpa_supplicant" rcvar= -command="/usr/sbin/${name}" -conf_file="/etc/wpa_supplicant.conf" ifn="$2" if [ -z "$ifn" ]; then return 1 fi +is_wired_interface() +{ + media=`ifconfig $1 2>/dev/null | while read line; do + case "$line" in + *media:?Ethernet*) + echo Ethernet + ;; + esac + done` + test "$media" = "Ethernet" +} + case ${ifn} in ndis*) driver="ndis" ;; *) - driver="bsd" + if is_wired_interface ${ifn} ; then + driver="wired" + else + driver="bsd" + fi ;; esac load_rc_config $name -pid_file="/var/run/${name}/${ifn}.pid" -command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file" +command=${wpa_supplicant_program} +conf_file=${wpa_supplicant_conf_file} +pidfile="/var/run/${name}/${ifn}.pid" +command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file run_rc_command "$1" ==== //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#10 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.13 2008/03/31 12:14:04 kib Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.14 2008/04/07 13:53:51 deischen Exp $ */ /* @@ -66,11 +66,6 @@ clock_settime; close; connect; - cpuset; - cpuset_getid; - cpuset_setid; - cpuset_getaffinity; - cpuset_setaffinity; dup; dup2; eaccess; @@ -335,6 +330,11 @@ }; FBSD_1.1 { + cpuset; + cpuset_getid; + cpuset_setid; + cpuset_getaffinity; + cpuset_setaffinity; faccessat; fchmodat; fchownat; ==== //depot/projects/dtrace/src/release/ia64/mkisoimages.sh#4 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.11 2005/01/30 21:10:52 kensmith Exp $ +# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.12 2008/04/08 02:57:59 marcel Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -67,7 +67,7 @@ # To create a bootable CD under EFI, the boot image should be an EFI # system partition. if [ $bootable = yes ]; then - EFISZ=32768 + EFISZ=40960 MNT=/mnt dd if=/dev/zero of=$BASE/$EFIPART count=$EFISZ md=`mdconfig -a -t vnode -f $BASE/$EFIPART` ==== //depot/projects/dtrace/src/sbin/gpt/gpt.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.19 2008/01/30 13:29:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.20 2008/04/07 18:23:28 jhb Exp $"); #include #include @@ -317,6 +317,13 @@ return (0); } break; + case 'z': + if (strcmp(s, "zfs") == 0) { + uuid_t zfs = GPT_ENT_TYPE_FREEBSD_ZFS; + *uuid = zfs; + return (0); + } + break; } return (EINVAL); } ==== //depot/projects/dtrace/src/share/man/man4/asmc.4#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2007 Rui Paulo +.\" Copyright (c) 2007, 2008 Rui Paulo .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,9 +23,9 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/asmc.4,v 1.3 2007/11/13 11:31:53 ru Exp $ +.\" $FreeBSD: src/share/man/man4/asmc.4,v 1.4 2008/04/07 11:27:16 rpaulo Exp $ .\" -.Dd November 10, 2007 +.Dd April 7, 2008 .Dt ASMC 4 .Os .Sh NAME @@ -121,7 +121,7 @@ the following way: .Bd -literal -offset indent notify 0 { - match "system" "ISA"; + match "system" "ACPI"; match "subsystem" "asmc"; action "/usr/local/sbin/ataidle -s X Y"; }; ==== //depot/projects/dtrace/src/share/man/man4/bpf.4#6 (text+ko) ==== @@ -47,7 +47,7 @@ .\" This document is derived in part from the enet man page (enet.4) .\" distributed with 4.3BSD Unix. .\" -.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.49 2008/03/24 13:49:17 csjp Exp $ +.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.50 2008/04/07 02:51:00 rwatson Exp $ .\" .Dd February 26, 2007 .Dt BPF 4 @@ -259,14 +259,14 @@ They will return a readable file descriptor when ownership of the next buffer is assigned to user space. .Pp -In the current implementation, the kernel will assign ownership of at most -one buffer at a time to the user process. -The user processes must acknowledge the current buffer in order to be -notified that the next buffer is ready for processing. -Programs should not rely on this as an invariant, as it may change in future -versions; in particular, they must maintain their own notion of which buffer -is "next" so that if both buffers are owned by userspace, it can process them -in the correct order. +In the current implementation, the kernel may assign zero, one, or both +buffers to the user process; however, an earlier implementation maintained +the invariant that at most one buffer could be assigned to the user process +at a time. +In order to both ensure progress and high performance, user processes should +acknowledge a completely processed buffer as quickly as possible, returning +it for reuse, and not block waiting on a second buffer while holding another +buffer. .Sh IOCTLS The .Xr ioctl 2 ==== //depot/projects/dtrace/src/share/man/man4/psm.4#4 (text+ko) ==== @@ -24,9 +24,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/psm.4,v 1.48 2005/07/15 17:35:25 hrs Exp $ +.\" $FreeBSD: src/share/man/man4/psm.4,v 1.49 2008/04/08 17:55:25 jkim Exp $ .\" -.Dd September 29, 2004 +.Dd April 8, 2008 .Dt PSM 4 .Os .Sh NAME @@ -110,7 +110,9 @@ 8 byte data packets are sent to the user program at this level. .Pp At the operation level two, data from the pointing device is passed to the -user program as is. +user program as is. Conversely, command from the user program is passed +to the pointing device as is and the user program is responsible for +status validation and error recovery. Modern PS/2 type pointing devices often use proprietary data format. Therefore, the user program is expected to have intimate knowledge about the format from a particular device when operating ==== //depot/projects/dtrace/src/share/man/man5/rc.conf.5#27 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.337 2008/03/28 07:57:52 brooks Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.339 2008/04/09 21:24:11 emax Exp $ .\" -.Dd January 27, 2008 +.Dd April 9, 2008 .Dt RC.CONF 5 .Os .Sh NAME @@ -3880,6 +3880,108 @@ If set to .Dq Li YES , enable support for sound mixer. +.It Va hcsecd_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable Bluetooth security daemon. +.It Va hcsecd_config +.Pq Vt str +Configuration file for +.Xr hcsecd 8 . +Default +.Pa /etc/bluetooth/hcsecd.conf . +.It Va sdpd_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable Bluetooth Service Discovery Protocol daemon. +.It Va sdpd_control +.Pq Vt str +Path to +.Xr sdpd 8 +control socket. +Default +.Pa /var/run/sdp . +.It Va sdpd_groupname +.Pq Vt str +Sets +.Xr sdpd 8 +group to run as after it initializes. +Default +.Dq Li nobody . +.It Va sdpd_username +.Pq Vt str +Sets +.Xr sdpd 8 +user to run as after it initializes. +Default +.Dq Li nobody . +.It Va bthidd_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable Bluetooth Human Interface Device daemon. +.It Va bthidd_config +.Pq Vt str +Configuration file for +.Xr bthidd 8 . +Default +.Pa /etc/bluetooth/bthidd.conf . +.It Va bthidd_hids +.Pq Vt str +Path to a file, where +.Xr bthidd 8 +will store information about known HID devices. +Default +.Pa /var/db/bthidd.hids . +.It Va rfcomm_pppd_server_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable Bluetooth RFCOMM PPP wrapper daemon. +.It Va rfcomm_pppd_server_profile +.Pq Vt str +The name of the profile to use from +.Pa /etc/ppp/ppp.conf . +Multiple profiles can be specified here. +Also used to specify per-profile overrides. +When the profile name contains any of the characters +.Dq Li .-/+ +they are translated to +.Dq Li _ +for the proposes of the override variable names. +.It Va rfcomm_pppd_server_ Ns Ao Ar profile Ac Ns _bdaddr +.Pq Vt str +Overrides local address to listen on. +By default +.Xr rfcomm_pppd 8 +will listen on +.Dq Li ANY +address. +The address can be specified as BD_ADDR or name. +.It Va rfcomm_pppd_server_ Ns Ao Ar profile Ac Ns _channel +.Pq Vt str +Overrides local RFCOMM channel to listen on. +By default +.Xr rfcomm_pppd 8 +will listen on RFCOMM channel 1. +Must set properly if multiple profiles used in the same time. +.It Va rfcomm_pppd_server_ Ns Ao Ar profile Ac Ns _register_sp +.Pq Vt bool +Tells +.Xr rfcomm_pppd 8 +if it should register Serial Port service on the speficied RFCOMM channel. +Default +.Dq Li NO . +.It Va rfcomm_pppd_server_ Ns Ao Ar profile Ac Ns _register_dun +.Pq Vt bool +Tells +.Xr rfcomm_pppd 8 +if it should register Dial-Up Networking service on the speficied +RFCOMM channel. +Default +.Dq Li NO . .El .Sh FILES .Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact @@ -3920,12 +4022,14 @@ .Xr amd 8 , .Xr apm 8 , .Xr atm 8 , +.Xr bthidd 8 , .Xr chkprintcap 8 , .Xr chown 8 , .Xr cron 8 , .Xr dhclient 8 , .Xr ftpd 8 , .Xr geli 8 , +.Xr hcsecd 8 , .Xr ifconfig 8 , .Xr inetd 8 , .Xr ipf 8 , @@ -3955,6 +4059,7 @@ .Xr quotaon 8 , .Xr rc 8 , .Xr rc.sendmail 8 , +.Xr rfcomm_pppd 8 , .Xr route 8 , .Xr routed 8 , .Xr rpcbind 8 , @@ -3962,6 +4067,7 @@ .Xr rpc.statd 8 , .Xr rwhod 8 , .Xr savecore 8 , +.Xr sdpd 8 , .Xr sshd 8 , .Xr swapon 8 , .Xr sysctl 8 , ==== //depot/projects/dtrace/src/share/mk/bsd.lib.mk#14 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.183 2007/10/20 19:01:49 ru Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.184 2008/04/09 20:27:53 kan Exp $ # .include @@ -139,7 +139,7 @@ .include -# Allow librararies to specify their own version map or have it +# Allow libraries to specify their own version map or have it # automatically generated (see bsd.symver.mk above). .if ${MK_SYMVER} == "yes" && !empty(VERSION_MAP) ${SHLIB_NAME}: ${VERSION_MAP} ==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#39 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.612 2008/04/04 18:00:22 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.613 2008/04/07 07:38:02 alc Exp $"); /* * Manages physical address maps. @@ -220,6 +220,7 @@ static void pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va); static pv_entry_t pmap_pvh_remove(struct md_page *pvh, pmap_t pmap, vm_offset_t va); +static int pmap_pvh_wired_mappings(struct md_page *pvh, int count); static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); static boolean_t pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t m, @@ -3673,16 +3674,29 @@ int pmap_page_wired_mappings(vm_page_t m) { - pv_entry_t pv; - pt_entry_t *pte; - pmap_t pmap; int count; count = 0; if ((m->flags & PG_FICTITIOUS) != 0) return (count); + count = pmap_pvh_wired_mappings(&m->md, count); + return (pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count)); +} + +/* + * pmap_pvh_wired_mappings: + * + * Return the updated number "count" of managed mappings that are wired. + */ +static int +pmap_pvh_wired_mappings(struct md_page *pvh, int count) +{ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 9 23:27:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EA191065672; Wed, 9 Apr 2008 23:27:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBAC51065670 for ; Wed, 9 Apr 2008 23:27:27 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D9F608FC1C for ; Wed, 9 Apr 2008 23:27:27 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m39NRRlI050375 for ; Wed, 9 Apr 2008 23:27:27 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m39NRR4H050365 for perforce@freebsd.org; Wed, 9 Apr 2008 23:27:27 GMT (envelope-from sam@freebsd.org) Date: Wed, 9 Apr 2008 23:27:27 GMT Message-Id: <200804092327.m39NRR4H050365@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 Cc: Subject: PERFORCE change 139688 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2008 23:27:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=139688 Change 139688 by sam@sam_ebb on 2008/04/09 23:27:01 record last deauth/disassoc/auth-failure code in the global stat structure since the node stats are lost when the node is reclaimed (we could propagate data to the vap on each node free but we'd still need a place to stick these) Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#18 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#18 (text+ko) ==== @@ -211,7 +211,10 @@ uint32_t is_ampdu_stop_failed; /* A-MPDU stream not running */ uint32_t is_ampdu_rx_reorder; /* A-MPDU held for rx reorder */ uint32_t is_scan_bg; /* background scans started */ - uint32_t is_spare[16]; + uint8_t is_rx_deauth_code; /* last rx'd deauth reason */ + uint8_t is_rx_disassoc_code; /* last rx'd disassoc reason */ + uint8_t is_rx_authfail_code; /* last rx'd auth fail reason */ + uint32_t is_spare[15]; }; /* From owner-p4-projects@FreeBSD.ORG Wed Apr 9 23:28:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 602661065675; Wed, 9 Apr 2008 23:28:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21AAD1065671 for ; Wed, 9 Apr 2008 23:28:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0FA228FC1C for ; Wed, 9 Apr 2008 23:28:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m39NSSWd050541 for ; Wed, 9 Apr 2008 23:28:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m39NSSkG050537 for perforce@freebsd.org; Wed, 9 Apr 2008 23:28:28 GMT (envelope-from sam@freebsd.org) Date: Wed, 9 Apr 2008 23:28:28 GMT Message-Id: <200804092328.m39NSSkG050537@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 Cc: Subject: PERFORCE change 139689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2008 23:28:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=139689 Change 139689 by sam@sam_ebb on 2008/04/09 23:27:44 o record status/reason code for last auth failure, deauth, and disassoc o move some checks up so we don't count frames we're going to drop Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#9 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#9 (text+ko) ==== @@ -928,6 +928,7 @@ IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, "open auth failed (reason %d)", status); vap->iv_stats.is_rx_auth_fail++; + vap->iv_stats.is_rx_authfail_code = status; ieee80211_new_state(vap, IEEE80211_S_SCAN, IEEE80211_SCAN_FAIL_STATUS); } else @@ -1023,6 +1024,7 @@ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, wh, "shared key auth failed (reason %d)", status); vap->iv_stats.is_rx_auth_fail++; + vap->iv_stats.is_rx_authfail_code = status; return; } ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0); @@ -1564,20 +1566,23 @@ vap->iv_stats.is_rx_mgtdiscard++; return; } + if (!IEEE80211_ADDR_EQ(wh->i_addr1, vap->iv_myaddr)) { + /* NB: can happen when in promiscuous mode */ + vap->iv_stats.is_rx_mgtdiscard++; + break; + } + /* * deauth frame format * [2] reason */ IEEE80211_VERIFY_LENGTH(efrm - frm, 2, return); reason = le16toh(*(uint16_t *)frm); + vap->iv_stats.is_rx_deauth++; + vap->iv_stats.is_rx_deauth_code = reason; IEEE80211_NODE_STAT(ni, rx_deauth); - if (!IEEE80211_ADDR_EQ(wh->i_addr1, vap->iv_myaddr)) { - /* NB: can happen when in promiscuous mode */ - vap->iv_stats.is_rx_mgtdiscard++; - break; - } IEEE80211_NOTE(vap, IEEE80211_MSG_AUTH, ni, "recv deauthenticate (reason %d)", reason); ieee80211_new_state(vap, IEEE80211_S_AUTH, @@ -1594,20 +1599,23 @@ vap->iv_stats.is_rx_mgtdiscard++; return; } + if (!IEEE80211_ADDR_EQ(wh->i_addr1, vap->iv_myaddr)) { + /* NB: can happen when in promiscuous mode */ + vap->iv_stats.is_rx_mgtdiscard++; + break; + } + /* * disassoc frame format * [2] reason */ IEEE80211_VERIFY_LENGTH(efrm - frm, 2, return); reason = le16toh(*(uint16_t *)frm); + vap->iv_stats.is_rx_disassoc++; + vap->iv_stats.is_rx_disassoc_code = reason; IEEE80211_NODE_STAT(ni, rx_disassoc); - if (!IEEE80211_ADDR_EQ(wh->i_addr1, vap->iv_myaddr)) { - /* NB: can happen when in promiscuous mode */ - vap->iv_stats.is_rx_mgtdiscard++; - break; - } IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni, "recv disassociate (reason %d)", reason); ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0); From owner-p4-projects@FreeBSD.ORG Wed Apr 9 23:28:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23B821065719; Wed, 9 Apr 2008 23:28:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 442B41065673 for ; Wed, 9 Apr 2008 23:28:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 32C308FC1D for ; Wed, 9 Apr 2008 23:28:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m39NSTOf050557 for ; Wed, 9 Apr 2008 23:28:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m39NST6R050553 for perforce@freebsd.org; Wed, 9 Apr 2008 23:28:29 GMT (envelope-from sam@freebsd.org) Date: Wed, 9 Apr 2008 23:28:29 GMT Message-Id: <200804092328.m39NST6R050553@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 Cc: Subject: PERFORCE change 139690 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2008 23:28:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=139690 Change 139690 by sam@sam_ebb on 2008/04/09 23:28:20 hookup some stats; unfortunately it doesn't look like we get the status/reason codes from the firmware to record on failure Affected files ... .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#23 edit Differences ... ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#23 (text+ko) ==== @@ -1469,9 +1469,11 @@ sc->flags &= ~IWI_FLAG_ASSOCIATED; if (vap->iv_state != IEEE80211_S_RUN) { DPRINTFN(2, ("Authentication failed\n")); + vap->iv_stats.is_rx_auth_fail++; IWI_STATE_END(sc, IWI_FW_ASSOCIATING); } else { DPRINTFN(2, ("Deauthenticated\n")); + vap->iv_stats.is_rx_deauth++; } taskqueue_enqueue(taskqueue_swi, &IWI_VAP(vap)->iwi_assocfailed_task); @@ -1483,6 +1485,7 @@ case IWI_AUTH_SEQ1_FAIL: DPRINTFN(2, ("Initial authentication handshake failed; " "you probably need shared key\n")); + vap->iv_stats.is_rx_auth_fail++; IWI_STATE_END(sc, IWI_FW_ASSOCIATING); /* XXX retry shared key when in auto */ break; @@ -1522,6 +1525,7 @@ case IWI_FW_DISASSOCIATING: DPRINTFN(2, ("Dissassociated\n")); IWI_STATE_END(sc, IWI_FW_DISASSOCIATING); + vap->iv_stats.is_rx_disassoc++; taskqueue_enqueue(taskqueue_swi, &IWI_VAP(vap)->iwi_assocfailed_task); break; From owner-p4-projects@FreeBSD.ORG Wed Apr 9 23:29:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF6FC1065672; Wed, 9 Apr 2008 23:29:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 713AB106566C for ; Wed, 9 Apr 2008 23:29:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F18C8FC1F for ; Wed, 9 Apr 2008 23:29:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m39NTUUc050750 for ; Wed, 9 Apr 2008 23:29:30 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m39NTUMp050748 for perforce@freebsd.org; Wed, 9 Apr 2008 23:29:30 GMT (envelope-from sam@freebsd.org) Date: Wed, 9 Apr 2008 23:29:30 GMT Message-Id: <200804092329.m39NTUMp050748@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 Cc: Subject: PERFORCE change 139691 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2008 23:29:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=139691 Change 139691 by sam@sam_ebb on 2008/04/09 23:28:45 show last auth failure, deauth, and disassoc reasons Affected files ... .. //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#7 edit Differences ... ==== //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#7 (text+ko) ==== @@ -113,7 +113,10 @@ "rx w/ unsupported auth alg" }, #define S_RX_AUTH_FAIL AFTER(S_RX_AUTH_UNSUPPORTED) { 5, "rx_auth_fail", "auth_fail", "rx sta auth failure" }, -#define S_RX_AUTH_COUNTERMEASURES AFTER(S_RX_AUTH_FAIL) +#define S_RX_AUTH_FAIL_CODE AFTER(S_RX_AUTH_FAIL) + { 5, "rx_auth_fail_code","auth_fail_code", + "last rx auth failure reason" }, +#define S_RX_AUTH_COUNTERMEASURES AFTER(S_RX_AUTH_FAIL_CODE) { 5, "rx_auth_countermeasures", "auth_countermeasures", "rx sta auth failure 'cuz of TKIP countermeasures" }, #define S_RX_ASSOC_BSS AFTER(S_RX_AUTH_COUNTERMEASURES) @@ -130,9 +133,14 @@ "rx assoc w/ bad WPA IE" }, #define S_RX_DEAUTH AFTER(S_RX_ASSOC_BADWPAIE) { 5, "rx_deauth", "deauth", "rx deauthentication" }, -#define S_RX_DISASSOC AFTER(S_RX_DEAUTH) +#define S_RX_DEAUTH_CODE AFTER(S_RX_DEAUTH) + { 5, "rx_deauth_code","deauth_code", "last rx deauth reason" }, +#define S_RX_DISASSOC AFTER(S_RX_DEAUTH_CODE) { 5, "rx_disassoc", "disassoc", "rx disassociation" }, -#define S_RX_BADSUBTYPE AFTER(S_RX_DISASSOC) +#define S_RX_DISASSOC_CODE AFTER(S_RX_DISASSOC) + { 5, "rx_disassoc_code","disassoc_code", + "last rx disassoc reason" }, +#define S_RX_BADSUBTYPE AFTER(S_RX_DISASSOC_CODE) { 5, "rx_badsubtype", "badsubtype", "rx frame w/ unknown subtype" }, #define S_RX_NOBUF AFTER(S_RX_BADSUBTYPE) { 5, "rx_nobuf", "nobuf", "rx failed for lack of mbuf" }, @@ -448,14 +456,14 @@ wf->ireq.i_data = (caddr_t) &wf->u_info; wf->ireq.i_len = sizeof(wf->u_info); if (ioctl(wf->s, SIOCG80211, &wf->ireq) < 0) - err(1, "%s (IEEE80211_IOC_STA_INFO)", wf->ireq.i_name); + warn("%s (IEEE80211_IOC_STA_INFO)", wf->ireq.i_name); IEEE80211_ADDR_COPY(nstats->is_u.macaddr, wf->mac); wf->ireq.i_type = IEEE80211_IOC_STA_STATS; wf->ireq.i_data = (caddr_t) nstats; wf->ireq.i_len = sizeof(*nstats); if (ioctl(wf->s, SIOCG80211, &wf->ireq) < 0) - err(1, "%s (IEEE80211_IOC_STA_STATS)", wf->ireq.i_name); + warn("%s (IEEE80211_IOC_STA_STATS)", wf->ireq.i_name); wf->ifr.ifr_data = (caddr_t) stats; if (ioctl(wf->s, SIOCG80211STATS, &wf->ifr) < 0) @@ -487,6 +495,81 @@ wf->ntotal = wf->ncur; } +void +setreason(char b[], size_t bs, int v) +{ +#define N(a) (sizeof(a)/sizeof(a[0])) + static const char *reasons[] = { + [IEEE80211_REASON_UNSPECIFIED] = "unspecified", + [IEEE80211_REASON_AUTH_EXPIRE] = "auth expire", + [IEEE80211_REASON_AUTH_LEAVE] = "auth leave", + [IEEE80211_REASON_ASSOC_EXPIRE] = "assoc expire", + [IEEE80211_REASON_ASSOC_TOOMANY] = "assoc toomany", + [IEEE80211_REASON_NOT_AUTHED] = "not authed", + [IEEE80211_REASON_NOT_ASSOCED] = "not assoced", + [IEEE80211_REASON_ASSOC_LEAVE] = "assoc leave", + [IEEE80211_REASON_ASSOC_NOT_AUTHED] = "assoc not authed", + [IEEE80211_REASON_DISASSOC_PWRCAP_BAD] = "disassoc pwrcap bad", + [IEEE80211_REASON_DISASSOC_SUPCHAN_BAD] = "disassoc supchan bad", + [IEEE80211_REASON_IE_INVALID] = "ie invalid", + [IEEE80211_REASON_MIC_FAILURE] = "mic failure", + [IEEE80211_REASON_4WAY_HANDSHAKE_TIMEOUT]= "4-way handshake timeout", + [IEEE80211_REASON_GROUP_KEY_UPDATE_TIMEOUT] = "group key update timeout", + [IEEE80211_REASON_IE_IN_4WAY_DIFFERS] = "ie in 4-way differs", + [IEEE80211_REASON_GROUP_CIPHER_INVALID] = "group cipher invalid", + [IEEE80211_REASON_PAIRWISE_CIPHER_INVALID]= "pairwise cipher invalid", + [IEEE80211_REASON_AKMP_INVALID] = "akmp invalid", + [IEEE80211_REASON_UNSUPP_RSN_IE_VERSION]= "unsupported rsn ie version", + [IEEE80211_REASON_INVALID_RSN_IE_CAP] = "invalid rsn ie cap", + [IEEE80211_REASON_802_1X_AUTH_FAILED] = "802.1x auth failed", + [IEEE80211_REASON_CIPHER_SUITE_REJECTED]= "cipher suite rejected", + }; + if (v < N(reasons) && reasons[v] != NULL) + snprintf(b, bs, "%s (%u)", reasons[v], v); + else + snprintf(b, bs, "%u", v); +#undef N +} + +void +setstatus(char b[], size_t bs, int v) +{ +#define N(a) (sizeof(a)/sizeof(a[0])) + static const char *status[] = { + [IEEE80211_STATUS_SUCCESS] = "success", + [IEEE80211_STATUS_UNSPECIFIED] = "unspecified", + [IEEE80211_STATUS_CAPINFO] = "capinfo", + [IEEE80211_STATUS_NOT_ASSOCED] = "not assoced", + [IEEE80211_STATUS_OTHER] = "other", + [IEEE80211_STATUS_ALG] = "algorithm", + [IEEE80211_STATUS_SEQUENCE] = "sequence", + [IEEE80211_STATUS_CHALLENGE] = "challenge", + [IEEE80211_STATUS_TIMEOUT] = "timeout", + [IEEE80211_STATUS_TOOMANY] = "toomany", + [IEEE80211_STATUS_BASIC_RATE] = "basic rate", + [IEEE80211_STATUS_SP_REQUIRED] = "sp required", + [IEEE80211_STATUS_PBCC_REQUIRED] = "pbcc required", + [IEEE80211_STATUS_CA_REQUIRED] = "ca required", + [IEEE80211_STATUS_SPECMGMT_REQUIRED] = "specmgmt required", + [IEEE80211_STATUS_PWRCAP_REQUIRED] = "pwrcap required", + [IEEE80211_STATUS_SUPCHAN_REQUIRED] = "supchan required", + [IEEE80211_STATUS_SHORTSLOT_REQUIRED] = "shortslot required", + [IEEE80211_STATUS_DSSSOFDM_REQUIRED] = "dsssofdm required", + [IEEE80211_STATUS_INVALID_IE] = "invalid ie", + [IEEE80211_STATUS_GROUP_CIPHER_INVALID] = "group cipher invalid", + [IEEE80211_STATUS_PAIRWISE_CIPHER_INVALID]= "pairwise cipher invalid", + [IEEE80211_STATUS_AKMP_INVALID] = "akmp invalid", + [IEEE80211_STATUS_UNSUPP_RSN_IE_VERSION]= "unsupported rsn ie version", + [IEEE80211_STATUS_INVALID_RSN_IE_CAP] = "invalid rsn ie cap", + [IEEE80211_STATUS_CIPHER_SUITE_REJECTED]= "cipher suite rejected", + }; + if (v < N(status) && status[v] != NULL) + snprintf(b, bs, "%s (%u)", status[v], v); + else + snprintf(b, bs, "%u", v); +#undef N +} + static int wlan_getinfo(struct wlanstatfoo_p *wf, int s, char b[], size_t bs) { @@ -505,6 +588,21 @@ case S_SIGNAL: snprintf(b, bs, "%d", si->isi_rssi + si->isi_noise); return 1; + case S_RX_AUTH_FAIL_CODE: + if (wf->cur.is_rx_authfail_code == 0) + break; + setstatus(b, bs, wf->cur.is_rx_authfail_code); + return 1; + case S_RX_DEAUTH_CODE: + if (wf->cur.is_rx_deauth_code == 0) + break; + setreason(b, bs, wf->cur.is_rx_deauth_code); + return 1; + case S_RX_DISASSOC_CODE: + if (wf->cur.is_rx_disassoc_code == 0) + break; + setreason(b, bs, wf->cur.is_rx_disassoc_code); + return 1; } b[0] = '\0'; return 0; From owner-p4-projects@FreeBSD.ORG Thu Apr 10 00:19:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BF641065676; Thu, 10 Apr 2008 00:19:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D20091065671 for ; Thu, 10 Apr 2008 00:19:21 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C067E8FC26 for ; Thu, 10 Apr 2008 00:19:21 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3A0JLtX059352 for ; Thu, 10 Apr 2008 00:19:21 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3A0JLqM059350 for perforce@freebsd.org; Thu, 10 Apr 2008 00:19:21 GMT (envelope-from sam@freebsd.org) Date: Thu, 10 Apr 2008 00:19:21 GMT Message-Id: <200804100019.m3A0JLqM059350@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 Cc: Subject: PERFORCE change 139693 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2008 00:19:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=139693 Change 139693 by sam@sam_ebb on 2008/04/10 00:19:10 count beacon miss events handled in the 802.11 layer Affected files ... .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#24 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#19 edit .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#10 edit .. //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#8 edit Differences ... ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#24 (text+ko) ==== @@ -1557,6 +1557,7 @@ DPRINTF(("Beacon miss: %u >= %u\n", le32toh(beacon->number), vap->iv_bmissthreshold)); + vap->iv_stats.is_beacon_miss++; /* * It's pointless to notify the 802.11 layer * as it'll try to send a probe request (which ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#19 (text+ko) ==== @@ -214,7 +214,8 @@ uint8_t is_rx_deauth_code; /* last rx'd deauth reason */ uint8_t is_rx_disassoc_code; /* last rx'd disassoc reason */ uint8_t is_rx_authfail_code; /* last rx'd auth fail reason */ - uint32_t is_spare[15]; + uint32_t is_beacon_miss; /* beacon miss notification */ + uint32_t is_spare[14]; }; /* ==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#10 (text+ko) ==== @@ -127,6 +127,7 @@ return; } vap->iv_bmiss_count = 0; + vap->iv_stats.is_beacon_miss++; if (vap->iv_roaming == IEEE80211_ROAMING_AUTO) { /* * If we receive a beacon miss interrupt when using ==== //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#8 (text+ko) ==== @@ -140,7 +140,9 @@ #define S_RX_DISASSOC_CODE AFTER(S_RX_DISASSOC) { 5, "rx_disassoc_code","disassoc_code", "last rx disassoc reason" }, -#define S_RX_BADSUBTYPE AFTER(S_RX_DISASSOC_CODE) +#define S_BMISS AFTER(S_RX_DISASSOC_CODE) + { 5, "bmiss", "bmiss", "beacon miss events handled" }, +#define S_RX_BADSUBTYPE AFTER(S_BMISS) { 5, "rx_badsubtype", "badsubtype", "rx frame w/ unknown subtype" }, #define S_RX_NOBUF AFTER(S_RX_BADSUBTYPE) { 5, "rx_nobuf", "nobuf", "rx failed for lack of mbuf" }, @@ -653,6 +655,7 @@ case S_RX_ASSOC_BADWPAIE: STAT(rx_assoc_badwpaie); case S_RX_DEAUTH: STAT(rx_deauth); case S_RX_DISASSOC: STAT(rx_disassoc); + case S_BMISS: STAT(beacon_miss); case S_RX_BADSUBTYPE: STAT(rx_badsubtype); case S_RX_NOBUF: STAT(rx_nobuf); case S_RX_DECRYPTCRC: STAT(rx_decryptcrc); @@ -796,6 +799,7 @@ case S_RX_ASSOC_BADWPAIE: STAT(rx_assoc_badwpaie); case S_RX_DEAUTH: STAT(rx_deauth); case S_RX_DISASSOC: STAT(rx_disassoc); + case S_BMISS: STAT(beacon_miss); case S_RX_BADSUBTYPE: STAT(rx_badsubtype); case S_RX_NOBUF: STAT(rx_nobuf); case S_RX_DECRYPTCRC: STAT(rx_decryptcrc); From owner-p4-projects@FreeBSD.ORG Thu Apr 10 00:23:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 448701065671; Thu, 10 Apr 2008 00:23:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 071191065670 for ; Thu, 10 Apr 2008 00:23:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E97118FC13 for ; Thu, 10 Apr 2008 00:23:27 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3A0NRhv060037 for ; Thu, 10 Apr 2008 00:23:27 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3A0NRRJ060031 for perforce@freebsd.org; Thu, 10 Apr 2008 00:23:27 GMT (envelope-from sam@freebsd.org) Date: Thu, 10 Apr 2008 00:23:27 GMT Message-Id: <200804100023.m3A0NRRJ060031@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 Cc: Subject: PERFORCE change 139694 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2008 00:23:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=139694 Change 139694 by sam@sam_ebb on 2008/04/10 00:22:34 bump default bmiss count to 24 per the linux code (!) Affected files ... .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#25 edit Differences ... ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#25 (text+ko) ==== @@ -542,7 +542,8 @@ return NULL; vap = &ivp->iwi_vap; ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); - vap->iv_bmissthreshold = 10; /* override default */ + /* override the default, the setting comes from the linux driver */ + vap->iv_bmissthreshold = 24; /* override with driver methods */ ivp->iwi_newstate = vap->iv_newstate; vap->iv_newstate = iwi_newstate; From owner-p4-projects@FreeBSD.ORG Thu Apr 10 03:47:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54D1D1065670; Thu, 10 Apr 2008 03:47:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17573106566B for ; Thu, 10 Apr 2008 03:47:11 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 065A48FC1B for ; Thu, 10 Apr 2008 03:47:11 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3A3lAMv083730 for ; Thu, 10 Apr 2008 03:47:10 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3A3lA1E083719 for perforce@freebsd.org; Thu, 10 Apr 2008 03:47:10 GMT (envelope-from kevlo@freebsd.org) Date: Thu, 10 Apr 2008 03:47:10 GMT Message-Id: <200804100347.m3A3lA1E083719@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 139705 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2008 03:47:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=139705 Change 139705 by kevlo@kevlo_wsl on 2008/04/10 03:46:19 Add Marvell 88F5181 support Reviewed by: raj Affected files ... .. //depot/projects/arm/src/sys/arm/orion/5x/5x.c#2 edit .. //depot/projects/arm/src/sys/arm/orion/orionreg.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/orion/5x/5x.c#2 (text+ko) ==== @@ -133,8 +133,8 @@ * System dentifiers are available in the registers range * of PCIE controller. */ - *dev = bus_space_read_4(obio_tag, ORION_PCIE_BASE, 0); - *rev = bus_space_read_4(obio_tag, ORION_PCIE_BASE, 8); + *dev = bus_space_read_4(obio_tag, ORION_PCIE_BASE, 0) >> 16; + *rev = bus_space_read_4(obio_tag, ORION_PCIE_BASE, 8) & 0xff; } void @@ -148,30 +148,24 @@ printf("SOC: "); if (bootverbose) - printf("(0x%8x:0x%08x) ", d, r); + printf("(0x%4x:0x%04x) ", d, r); - if ((d & 0xffff) == ORION_ID_MV) - printf("Marvell 88F"); - else { - printf("Unknown vendor\n"); - return; - } - - d >>= 16; - r &= 0xff; - if (d == ORION_ID_88F5182) { - dev = "5182"; + if (d == ORION_ID_88F5181) { + dev = "Marvell 88F5181"; + rev = (r == 3) ? "B1" : ""; + } else if (d == ORION_ID_88F5182) { + dev = "Marvell 88F5182"; rev = (r == 2) ? "A2" : ""; - } else if (d == ORION_ID_88F5281) { - dev = "5281"; + dev = "Marvell 88F5281"; if (r == 4) rev = "D0"; else if (r == 5) rev = "D1"; + else if (r == 6) + rev = "D2"; else rev = ""; - } else { dev = "UNKNOWN"; rev = ""; @@ -264,8 +258,9 @@ { /* Depending on the SoC windows 0-1, or 0-3 have remap capability */ - if (((dev >> 16) == ORION_ID_88F5182 && i < 2) || - ((dev >> 16) == ORION_ID_88F5281 && i < 4)) + if ((dev == ORION_ID_88F5181 && i < 2) || + (dev == ORION_ID_88F5182 && i < 2) || + (dev == ORION_ID_88F5281 && i < 4)) return (1); return (0); ==== //depot/projects/arm/src/sys/arm/orion/orionreg.h#4 (text+ko) ==== @@ -216,6 +216,7 @@ * Chip ID */ #define ORION_ID_MV 0x11ab +#define ORION_ID_88F5181 0x5181 #define ORION_ID_88F5182 0x5182 #define ORION_ID_88F5281 0x5281 From owner-p4-projects@FreeBSD.ORG Thu Apr 10 05:36:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51E2E1065672; Thu, 10 Apr 2008 05:36:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1447F1065670 for ; Thu, 10 Apr 2008 05:36:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 036798FC25 for ; Thu, 10 Apr 2008 05:36:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3A5aEEH098893 for ; Thu, 10 Apr 2008 05:36:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3A5aEHw098891 for perforce@freebsd.org; Thu, 10 Apr 2008 05:36:14 GMT (envelope-from sam@freebsd.org) Date: Thu, 10 Apr 2008 05:36:14 GMT Message-Id: <200804100536.m3A5aEHw098891@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 Cc: Subject: PERFORCE change 139710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2008 05:36:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=139710 Change 139710 by sam@sam_ebb on 2008/04/10 05:35:31 IFC @ 139709 Affected files ... .. //depot/projects/vap/etc/rc.d/ppp#6 integrate .. //depot/projects/vap/include/string.h#3 integrate .. //depot/projects/vap/lib/libc/string/Makefile.inc#3 integrate .. //depot/projects/vap/lib/libc/string/Symbol.map#3 integrate .. //depot/projects/vap/lib/libc/string/memchr.3#3 integrate .. //depot/projects/vap/lib/libc/string/memrchr.c#1 branch .. //depot/projects/vap/share/man/man5/rc.conf.5#8 integrate .. //depot/projects/vap/share/mk/bsd.lib.mk#3 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/vap/sys/dev/ral/rt2661.c#24 integrate .. //depot/projects/vap/sys/dev/usb/ubsa.c#7 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/vap/sys/kern/subr_firmware.c#6 integrate .. //depot/projects/vap/sys/kern/vfs_cache.c#10 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#16 integrate .. //depot/projects/vap/sys/pci/if_rl.c#7 integrate .. //depot/projects/vap/sys/powerpc/include/atomic.h#9 integrate .. //depot/projects/vap/sys/sparc64/include/intr_machdep.h#5 integrate .. //depot/projects/vap/sys/sparc64/include/smp.h#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/intr_machdep.c#8 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/vap/sys/sys/param.h#17 integrate Differences ... ==== //depot/projects/vap/etc/rc.d/ppp#6 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.19 2008/04/06 20:39:33 brooks Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.20 2008/04/10 01:32:49 brooks Exp $ # # PROVIDE: ppp @@ -19,6 +19,7 @@ ppp_start_profile() { local _ppp_profile _ppp_mode _ppp_nat _ppp_unit + local _ppp_profile_cleaned _punct _punct_c _ppp_profile=$1 _ppp_profile_cleaned=$1 ==== //depot/projects/vap/include/string.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.25 2005/11/24 08:30:44 ru Exp $ + * $FreeBSD: src/include/string.h,v 1.26 2008/04/10 00:12:43 delphij Exp $ */ #ifndef _STRING_H_ @@ -59,6 +59,7 @@ void *memccpy(void * __restrict, const void * __restrict, int, size_t); #endif void *memchr(const void *, int, size_t) __pure; +void *memrchr(const void *, int, size_t) __pure; int memcmp(const void *, const void *, size_t) __pure; void *memcpy(void * __restrict, const void * __restrict, size_t); #if __BSD_VISIBLE ==== //depot/projects/vap/lib/libc/string/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.37 2006/03/13 01:15:00 deischen Exp $ +# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.38 2008/04/10 00:12:44 delphij Exp $ .PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string @@ -7,7 +7,7 @@ # machine-independent string sources MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c fls.c flsl.c index.c memccpy.c \ - memchr.c memcmp.c \ + memchr.c memrchr.c memcmp.c \ memcpy.c memmem.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c \ strcat.c strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c \ strerror.c strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c \ @@ -39,6 +39,7 @@ MLINKS+=ffs.3 fls.3 MLINKS+=ffs.3 flsl.3 MLINKS+=index.3 rindex.3 +MLINKS+=memchr.3 memrchr.3 MLINKS+=strcasecmp.3 strncasecmp.3 MLINKS+=strcat.3 strncat.3 MLINKS+=strchr.3 strrchr.3 ==== //depot/projects/vap/lib/libc/string/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.2 2007/04/29 14:05:19 deischen Exp $ + * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.3 2008/04/10 00:12:44 delphij Exp $ */ FBSD_1.0 { @@ -77,6 +77,10 @@ wmemset; }; +FBSD_1.1 { + memrchr; +}; + FBSDprivate_1.0 { __strtok_r; }; ==== //depot/projects/vap/lib/libc/string/memchr.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)memchr.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.9 2007/01/09 00:28:12 imp Exp $ +.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.10 2008/04/10 00:12:44 delphij Exp $ .\" -.Dd June 4, 1993 +.Dd April 9, 2008 .Dt MEMCHR 3 .Os .Sh NAME @@ -44,6 +44,8 @@ .In string.h .Ft void * .Fn memchr "const void *b" "int c" "size_t len" +.Ft void * +.Fn memrchr "const void *b" "int c" "size_t len" .Sh DESCRIPTION The .Fn memchr @@ -53,11 +55,22 @@ (converted to an unsigned char) in string .Fa b . +.Pp +The +.Fn memrchr +function behaves like +.Fn memchr , +except that it locates the last occurrence of +.Fa c +in string +.Fa b . .Sh RETURN VALUES The .Fn memchr -function -returns a pointer to the byte located, +and +.Fn memrchr +functions +return a pointer to the byte located, or NULL if no such byte exists within .Fa len bytes. @@ -77,3 +90,15 @@ function conforms to .St -isoC . +.Pp +The +.Fn memrchr +function is a GNU extension and conforms to no standard. +.Sh HISTORY +The +.Fn memrchr +function first appeared in GNU libc 2.1.91, this implementation +first appeared in +.Fx 8.0 , +coming from +.Ox 4.3 . ==== //depot/projects/vap/share/man/man5/rc.conf.5#8 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.338 2008/04/08 23:34:12 emax Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.339 2008/04/09 21:24:11 emax Exp $ .\" -.Dd January 27, 2008 +.Dd April 9, 2008 .Dt RC.CONF 5 .Os .Sh NAME ==== //depot/projects/vap/share/mk/bsd.lib.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.183 2007/10/20 19:01:49 ru Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.184 2008/04/09 20:27:53 kan Exp $ # .include @@ -106,7 +106,7 @@ .include -# Allow librararies to specify their own version map or have it +# Allow libraries to specify their own version map or have it # automatically generated (see bsd.symver.mk above). .if ${MK_SYMVER} == "yes" && !empty(VERSION_MAP) ${SHLIB_NAME}: ${VERSION_MAP} ==== //depot/projects/vap/sys/dev/nfe/if_nfe.c#6 (text+ko) ==== @@ -21,7 +21,7 @@ /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */ #include -__FBSDID("$FreeBSD: src/sys/dev/nfe/if_nfe.c,v 1.27 2008/03/06 01:47:53 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nfe/if_nfe.c,v 1.28 2008/04/10 01:25:09 yongari Exp $"); #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -237,6 +237,14 @@ "NVIDIA nForce MCP67 Networking Adapter"}, {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_LAN4, "NVIDIA nForce MCP67 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_LAN1, + "NVIDIA nForce MCP73 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_LAN2, + "NVIDIA nForce MCP73 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_LAN3, + "NVIDIA nForce MCP73 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_LAN4, + "NVIDIA nForce MCP73 Networking Adapter"}, {0, 0, NULL} }; @@ -452,6 +460,10 @@ case PCI_PRODUCT_NVIDIA_MCP67_LAN2: case PCI_PRODUCT_NVIDIA_MCP67_LAN3: case PCI_PRODUCT_NVIDIA_MCP67_LAN4: + case PCI_PRODUCT_NVIDIA_MCP73_LAN1: + case PCI_PRODUCT_NVIDIA_MCP73_LAN2: + case PCI_PRODUCT_NVIDIA_MCP73_LAN3: + case PCI_PRODUCT_NVIDIA_MCP73_LAN4: sc->nfe_flags |= NFE_40BIT_ADDR | NFE_PWR_MGMT | NFE_CORRECT_MACADDR | NFE_TX_FLOW_CTRL; break; ==== //depot/projects/vap/sys/dev/nfe/if_nfereg.h#4 (text+ko) ==== @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/nfe/if_nfereg.h,v 1.11 2008/03/06 01:47:53 yongari Exp $ + * $FreeBSD: src/sys/dev/nfe/if_nfereg.h,v 1.12 2008/04/10 01:25:09 yongari Exp $ */ #define NFE_RX_RING_COUNT 256 @@ -291,6 +291,10 @@ #define PCI_PRODUCT_NVIDIA_MCP67_LAN2 0x054d #define PCI_PRODUCT_NVIDIA_MCP67_LAN3 0x054e #define PCI_PRODUCT_NVIDIA_MCP67_LAN4 0x054f +#define PCI_PRODUCT_NVIDIA_MCP73_LAN1 0x07dc +#define PCI_PRODUCT_NVIDIA_MCP73_LAN2 0x07dd +#define PCI_PRODUCT_NVIDIA_MCP73_LAN3 0x07de +#define PCI_PRODUCT_NVIDIA_MCP73_LAN4 0x07df #define PCI_PRODUCT_NVIDIA_NFORCE3_LAN2 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1 #define PCI_PRODUCT_NVIDIA_NFORCE3_LAN3 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2 ==== //depot/projects/vap/sys/dev/ral/rt2661.c#24 (text) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ral/rt2661.c,v 1.18 2007/11/06 07:30:11 kevlo Exp $ */ +/* $FreeBSD: src/sys/dev/ral/rt2661.c,v 1.19 2008/04/09 18:40:10 sam Exp $ */ /*- * Copyright (c) 2006 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ral/rt2661.c,v 1.18 2007/11/06 07:30:11 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ral/rt2661.c,v 1.19 2008/04/09 18:40:10 sam Exp $"); /*- * Ralink Technology RT2561, RT2561S and RT2661 chipset driver ==== //depot/projects/vap/sys/dev/usb/ubsa.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.34 2008/03/28 14:20:06 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.35 2008/04/09 22:20:28 flz Exp $"); /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -226,6 +226,8 @@ { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1 }, /* Novatel Wireless Merlin cards */ { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740 }, + /* Novatel Wireless Merlin v740 */ + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V740 }, /* Option Vodafone MC3G */ { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G }, /* Option GlobeTrotter 3G */ ==== //depot/projects/vap/sys/dev/usb/usbdevs#13 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.345 2008/03/28 14:20:06 rpaulo Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.346 2008/04/09 22:20:28 flz Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -1786,6 +1786,7 @@ /* Novatel Wireless products */ product NOVATEL CDMA_MODEM 0x1110 Novatel Wireless Merlin CDMA product NOVATEL V620 0x1110 Merlin V620 +product NOVATEL V740 0x1120 Merlin V740 product NOVATEL V720 0x1130 Merlin V720 product NOVATEL U740 0x1400 Merlin U740 product NOVATEL U720 0x2110 Merlin U720 ==== //depot/projects/vap/sys/kern/subr_firmware.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_firmware.c,v 1.9 2007/02/15 17:21:31 luigi Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_firmware.c,v 1.10 2008/04/09 19:07:48 sam Exp $"); #include #include @@ -263,7 +263,6 @@ mtx_lock(&firmware_mtx); mtx_unlock(&firmware_mtx); - /* XXX unlocked, necessary? */ if (td->td_proc->p_fd->fd_rdir == NULL) { printf("%s: root not mounted yet, no way to load image\n", imagename); @@ -279,12 +278,14 @@ mtx_lock(&firmware_mtx); fp = lookup(imagename, NULL); if (fp == NULL || fp->file != NULL) { + mtx_unlock(&firmware_mtx); if (fp == NULL) printf("%s: firmware image loaded, " "but did not register\n", imagename); (void) linker_release_module(imagename, NULL, NULL); - } else - fp->file = result; /* record the module identity */ + goto done; + } + fp->file = result; /* record the module identity */ mtx_unlock(&firmware_mtx); done: wakeup_one(imagename); /* we're done */ ==== //depot/projects/vap/sys/kern/vfs_cache.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.120 2008/03/31 11:53:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.121 2008/04/09 20:19:55 pjd Exp $"); #include #include @@ -423,7 +423,7 @@ * When we lookup "." we still can be asked to lock it * differently... */ - ltype = cnp->cn_lkflags & (LK_SHARED | LK_EXCLUSIVE); + ltype = cnp->cn_lkflags & LK_TYPE_MASK; if (ltype == VOP_ISLOCKED(*vpp)) return (-1); else if (ltype == LK_EXCLUSIVE) @@ -440,12 +440,14 @@ error = vget(*vpp, cnp->cn_lkflags | LK_INTERLOCK, cnp->cn_thread); if (cnp->cn_flags & ISDOTDOT) vn_lock(dvp, ltype | LK_RETRY); - if ((cnp->cn_flags & ISLASTCN) && (cnp->cn_lkflags & LK_EXCLUSIVE)) - ASSERT_VOP_ELOCKED(*vpp, "cache_lookup"); if (error) { *vpp = NULL; goto retry; } + if ((cnp->cn_flags & ISLASTCN) && + (cnp->cn_lkflags & LK_TYPE_MASK) == LK_EXCLUSIVE) { + ASSERT_VOP_ELOCKED(*vpp, "cache_lookup"); + } return (-1); } ==== //depot/projects/vap/sys/netgraph/ng_base.c#16 (text+ko) ==== @@ -38,7 +38,7 @@ * Authors: Julian Elischer * Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.155 2008/04/06 15:26:32 mav Exp $ + * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.156 2008/04/09 19:03:19 mav Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ @@ -1806,8 +1806,19 @@ | Active Writer ---------------------------------------+ +Node queue has such semantics: +- All flags modifications are atomic. +- Reader count can be incremented only if there is no writer or pending flags. + As soon as this can't be done with single operation, it is implemented with + spin loop and atomic_cmpset(). +- Writer flag can be set only if there is no any bits set. + It is implemented with atomic_cmpset(). +- Pending flag can be set any time, but to avoid collision on queue processing + all queue fields are protected by the mutex. +- Queue processing thread reads queue holding the mutex, but releases it while + processing. When queue is empty pending flag is removed. +*/ -*/ #define WRITER_ACTIVE 0x00000001 #define OP_PENDING 0x00000002 #define READER_INCREMENT 0x00000004 @@ -1849,19 +1860,16 @@ * nothing we could return, either because there really was nothing there, or * because the node was in a state where it cannot yet process the next item * on the queue. - * - * This MUST MUST MUST be called with the mutex held. */ static __inline item_p ng_dequeue(struct ng_queue *ngq, int *rw) { item_p item; + /* This MUST be called with the mutex held. */ mtx_assert(&ngq->q_mtx, MA_OWNED); - /* - * If there is nothing queued, then just return. - * No point in continuing. - */ + + /* If there is nothing queued, then just return. */ if (!QUEUE_ACTIVE(ngq)) { CTR4(KTR_NET, "%20s: node [%x] (%p) queue empty; " "queue flags 0x%lx", __func__, @@ -1878,22 +1886,25 @@ while (1) { long t = ngq->q_flags; if (t & WRITER_ACTIVE) { - /* It's a reader but we can't use it. */ + /* There is writer, reader can't proceed. */ CTR4(KTR_NET, "%20s: node [%x] (%p) queued reader " "can't proceed; queue flags 0x%lx", __func__, ngq->q_node->nd_ID, ngq->q_node, t); return (NULL); } - if (atomic_cmpset_long(&ngq->q_flags, t, + if (atomic_cmpset_acq_long(&ngq->q_flags, t, t + READER_INCREMENT)) break; cpu_spinwait(); } + /* We have got reader lock for the node. */ *rw = NGQRW_R; - } else if (atomic_cmpset_long(&ngq->q_flags, OP_PENDING, + } else if (atomic_cmpset_acq_long(&ngq->q_flags, OP_PENDING, OP_PENDING + WRITER_ACTIVE)) { + /* We have got writer lock for the node. */ *rw = NGQRW_W; } else { + /* There is somebody other, writer can't proceed. */ CTR4(KTR_NET, "%20s: node [%x] (%p) queued writer " "can't proceed; queue flags 0x%lx", __func__, ngq->q_node->nd_ID, ngq->q_node, ngq->q_flags); @@ -1918,10 +1929,8 @@ } /* - * Queue a packet to be picked up by someone else. - * We really don't care who, but we can't or don't want to hang around - * to process it ourselves. We are probably an interrupt routine.. - * If the queue could be run, flag the netisr handler to start. + * Queue a packet to be picked up later by someone else. + * If the queue could be run now, add node to the queue handler's worklist. */ static __inline void ng_queue_rw(struct ng_queue * ngq, item_p item, int rw) @@ -1950,6 +1959,7 @@ NG_QUEUE_UNLOCK(ngq); } +/* Acquire reader lock on node. If node is busy, queue the packet. */ static __inline item_p ng_acquire_read(struct ng_queue *ngq, item_p item) { @@ -1961,7 +1971,7 @@ long t = ngq->q_flags; if (t & NGQ_RMASK) break; /* Node is not ready for reader. */ - if (atomic_cmpset_long(&ngq->q_flags, t, t + READER_INCREMENT)) { + if (atomic_cmpset_acq_long(&ngq->q_flags, t, t + READER_INCREMENT)) { /* Successfully grabbed node */ CTR4(KTR_NET, "%20s: node [%x] (%p) acquired item %p", __func__, ngq->q_node->nd_ID, ngq->q_node, item); @@ -1976,6 +1986,7 @@ return (NULL); } +/* Acquire writer lock on node. If node is busy, queue the packet. */ static __inline item_p ng_acquire_write(struct ng_queue *ngq, item_p item) { @@ -1983,7 +1994,7 @@ ("%s: working on deadnode", __func__)); /* Writer needs completely idle node. */ - if (atomic_cmpset_long(&ngq->q_flags, 0, WRITER_ACTIVE)) { + if (atomic_cmpset_acq_long(&ngq->q_flags, 0, WRITER_ACTIVE)) { /* Successfully grabbed node */ CTR4(KTR_NET, "%20s: node [%x] (%p) acquired item %p", __func__, ngq->q_node->nd_ID, ngq->q_node, item); @@ -2070,18 +2081,21 @@ #endif +/* Release reader lock. */ static __inline void ng_leave_read(struct ng_queue *ngq) { - atomic_subtract_long(&ngq->q_flags, READER_INCREMENT); + atomic_subtract_rel_long(&ngq->q_flags, READER_INCREMENT); } +/* Release writer lock. */ static __inline void ng_leave_write(struct ng_queue *ngq) { - atomic_clear_long(&ngq->q_flags, WRITER_ACTIVE); + atomic_clear_rel_long(&ngq->q_flags, WRITER_ACTIVE); } +/* Purge node queue. Called on node shutdown. */ static void ng_flush_input_queue(struct ng_queue * ngq) { ==== //depot/projects/vap/sys/pci/if_rl.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.173 2008/03/03 04:15:08 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.174 2008/04/10 01:06:05 yongari Exp $"); /* * RealTek 8129/8139 PCI NIC driver @@ -1117,17 +1117,19 @@ * datasheet makes absolutely no mention of this and * RealTek should be shot for this. */ - if ((uint16_t)(rxstat >> 16) == RL_RXSTAT_UNFINISHED) + total_len = rxstat >> 16; + if (total_len == RL_RXSTAT_UNFINISHED) break; - if (!(rxstat & RL_RXSTAT_RXOK)) { + if (!(rxstat & RL_RXSTAT_RXOK) || + total_len < ETHER_MIN_LEN || + total_len > ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN) { ifp->if_ierrors++; rl_init_locked(sc); return; } /* No errors; receive the packet. */ - total_len = rxstat >> 16; rx_bytes += total_len + 4; /* ==== //depot/projects/vap/sys/powerpc/include/atomic.h#9 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/atomic.h,v 1.21 2008/04/09 01:00:35 marcel Exp $ + * $FreeBSD: src/sys/powerpc/include/atomic.h,v 1.22 2008/04/10 02:37:26 marcel Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -113,10 +113,10 @@ */ #define __ATOMIC_CLEAR_8(p, v, t) \ - 8-bit atomic_add not implemented + 8-bit atomic_clear not implemented #define __ATOMIC_CLEAR_16(p, v, t) \ - 16-bit atomic_add not implemented + 16-bit atomic_clear not implemented #define __ATOMIC_CLEAR_32(p, v, t) \ __asm __volatile( \ @@ -130,7 +130,7 @@ /* __ATOMIC_CLEAR_32 */ #define __ATOMIC_CLEAR_64(p, v, t) \ - 64-bit atomic_add not implemented + 64-bit atomic_clear not implemented #define _ATOMIC_CLEAR(width, suffix, type) \ static __inline void \ ==== //depot/projects/vap/sys/sparc64/include/intr_machdep.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/intr_machdep.h,v 1.17 2007/09/06 19:16:29 marius Exp $ + * $FreeBSD: src/sys/sparc64/include/intr_machdep.h,v 1.18 2008/04/09 21:14:01 marius Exp $ */ #ifndef _MACHINE_INTR_MACHDEP_H_ @@ -33,7 +33,7 @@ #define PIL_MAX (1 << 4) #define IV_MAX (1 << 11) -#define IV_NAMLEN 1024 +#define IV_NAMLEN 1024 #define IR_FREE (PIL_MAX * 2) @@ -46,6 +46,7 @@ #define PIL_RENDEZVOUS 3 /* smp rendezvous ipi */ #define PIL_AST 4 /* ast ipi */ #define PIL_STOP 5 /* stop cpu ipi */ +#define PIL_PREEMPT 6 /* preempt idle thread cpu ipi */ #define PIL_FAST 13 /* fast interrupts */ #define PIL_TICK 14 ==== //depot/projects/vap/sys/sparc64/include/smp.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/smp.h,v 1.22 2007/06/16 23:26:00 marius Exp $ + * $FreeBSD: src/sys/sparc64/include/smp.h,v 1.23 2008/04/09 21:14:01 marius Exp $ */ #ifndef _MACHINE_SMP_H_ @@ -51,6 +51,7 @@ #define IPI_AST PIL_AST #define IPI_RENDEZVOUS PIL_RENDEZVOUS +#define IPI_PREEMPT PIL_PREEMPT #define IPI_STOP PIL_STOP #define IPI_RETRIES 5000 ==== //depot/projects/vap/sys/sparc64/sparc64/intr_machdep.c#8 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/intr_machdep.c,v 1.31 2008/04/05 19:58:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/intr_machdep.c,v 1.32 2008/04/09 21:14:01 marius Exp $"); #include #include @@ -95,7 +95,8 @@ "rndzvs", /* PIL_RENDEZVOUS */ "ast", /* PIL_AST */ "stop", /* PIL_STOP */ - "stray", "stray", "stray", "stray", "stray", "stray", "stray", + "preempt", /* PIL_PREEMPT */ + "stray", "stray", "stray", "stray", "stray", "stray", "fast", /* PIL_FAST */ "tick", /* PIL_TICK */ }; ==== //depot/projects/vap/sys/sparc64/sparc64/mp_machdep.c#7 (text+ko) ==== @@ -29,6 +29,7 @@ */ /*- * Copyright (c) 2002 Jake Burkholder. + * Copyright (c) 2007 Marius Strobl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -54,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.38 2008/03/09 15:53:34 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.39 2008/04/09 21:14:01 marius Exp $"); #include #include @@ -91,6 +92,7 @@ #include static ih_func_t cpu_ipi_ast; +static ih_func_t cpu_ipi_preempt; static ih_func_t cpu_ipi_stop; /* @@ -257,6 +259,7 @@ intr_setup(PIL_RENDEZVOUS, (ih_func_t *)smp_rendezvous_action, -1, NULL, NULL); intr_setup(PIL_STOP, cpu_ipi_stop, -1, NULL, NULL); + intr_setup(PIL_PREEMPT, cpu_ipi_preempt, -1, NULL, NULL); cpuid_to_mid[curcpu] = PCPU_GET(mid); @@ -440,6 +443,13 @@ } static void +cpu_ipi_preempt(struct trapframe *tf) +{ + + sched_preempt(curthread); +} + +static void spitfire_ipi_selected(u_int cpus, u_long d0, u_long d1, u_long d2) { u_int cpu; ==== //depot/projects/vap/sys/sys/param.h#17 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.349 2008/04/08 17:55:26 jkim Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.350 2008/04/10 00:12:44 delphij Exp $ */ #ifndef _SYS_PARAM_H_ @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 800033 /* Master, propagated to newvers */ +#define __FreeBSD_version 800034 /* Master, propagated to newvers */ #ifndef LOCORE #include From owner-p4-projects@FreeBSD.ORG Thu Apr 10 09:07:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19E4F1065671; Thu, 10 Apr 2008 09:07:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF4CB1065670 for ; Thu, 10 Apr 2008 09:07:10 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF0688FC0C for ; Thu, 10 Apr 2008 09:07:10 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3A97ALL025453 for ; Thu, 10 Apr 2008 09:07:10 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3A979lS025451 for perforce@freebsd.org; Thu, 10 Apr 2008 09:07:09 GMT (envelope-from piso@freebsd.org) Date: Thu, 10 Apr 2008 09:07:09 GMT Message-Id: <200804100907.m3A979lS025451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 139717 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2008 09:07:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=139717 Change 139717 by piso@piso_ferret on 2008/04/10 09:06:27 IFC@139709 Affected files ... .. //depot/projects/soc2005/libalias/Makefile#16 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#29 integrate .. //depot/projects/soc2005/libalias/UPDATING#25 integrate .. //depot/projects/soc2005/libalias/bin/ls/ls.1#4 integrate .. //depot/projects/soc2005/libalias/bin/ls/ls.c#2 integrate .. //depot/projects/soc2005/libalias/bin/ls/ls.h#2 integrate .. //depot/projects/soc2005/libalias/bin/ls/print.c#3 integrate .. //depot/projects/soc2005/libalias/bin/ls/util.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/netcat/nc.1#3 integrate .. //depot/projects/soc2005/libalias/contrib/netcat/netcat.c#4 integrate .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#19 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#12 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ppp#7 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/soc2005/libalias/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/zfs#5 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#17 integrate .. //depot/projects/soc2005/libalias/include/complex.h#3 integrate .. //depot/projects/soc2005/libalias/include/stdio.h#4 integrate .. //depot/projects/soc2005/libalias/include/string.h#2 integrate .. //depot/projects/soc2005/libalias/include/unistd.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/err.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/msgctl.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/include/namespace.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/string/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/string/Symbol.map#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/string/memchr.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/string/memrchr.c#1 branch .. //depot/projects/soc2005/libalias/lib/libc/sys/Makefile.inc#9 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/Symbol.map#9 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/aio_cancel.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/soc2005/libalias/lib/libstand/nfs.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/amd64/Makefile.inc#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/soc2005/libalias/lib/libthr/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/i386/Makefile.inc#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/soc2005/libalias/lib/libthr/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_affinity.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_cond.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_private.h#14 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_rtld.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_rwlock.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_umtx.c#9 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_umtx.h#8 integrate .. //depot/projects/soc2005/libalias/lib/msun/Makefile#6 integrate .. //depot/projects/soc2005/libalias/lib/msun/Symbol.map#6 integrate .. //depot/projects/soc2005/libalias/lib/msun/amd64/Makefile.inc#4 integrate .. //depot/projects/soc2005/libalias/lib/msun/amd64/e_remainderl.S#1 branch .. //depot/projects/soc2005/libalias/lib/msun/amd64/s_remquol.S#1 branch .. //depot/projects/soc2005/libalias/lib/msun/i387/Makefile.inc#5 integrate .. //depot/projects/soc2005/libalias/lib/msun/i387/e_remainderl.S#1 branch .. //depot/projects/soc2005/libalias/lib/msun/i387/s_remquol.S#1 branch .. //depot/projects/soc2005/libalias/lib/msun/man/csqrt.3#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/man/hypot.3#4 integrate .. //depot/projects/soc2005/libalias/lib/msun/man/remainder.3#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/e_hypot.c#4 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/e_hypotl.c#1 branch .. //depot/projects/soc2005/libalias/lib/msun/src/e_remainder.c#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/e_remainderl.c#1 branch .. //depot/projects/soc2005/libalias/lib/msun/src/math.h#5 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_csqrtl.c#1 branch .. //depot/projects/soc2005/libalias/lib/msun/src/s_fma.c#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_fmal.c#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_remquo.c#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_remquol.c#1 branch .. //depot/projects/soc2005/libalias/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/w_cabsl.c#1 branch .. //depot/projects/soc2005/libalias/libexec/rtld-elf/mips/reloc.c#1 branch .. //depot/projects/soc2005/libalias/libexec/rtld-elf/mips/rtld_machdep.h#1 branch .. //depot/projects/soc2005/libalias/libexec/rtld-elf/mips/rtld_start.S#1 branch .. //depot/projects/soc2005/libalias/libexec/rtld-elf/rtld.c#10 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/soc2005/libalias/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/soc2005/libalias/sbin/ddb/ddb.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/ddb/ddb.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/main.c#5 integrate .. //depot/projects/soc2005/libalias/sbin/gpt/gpt.c#5 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifclone.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.c#10 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.h#6 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/restore/dirs.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/restore/interactive.c#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/Makefile#18 integrate .. //depot/projects/soc2005/libalias/share/man/man4/asmc.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/bpf.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/psm.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#18 integrate .. //depot/projects/soc2005/libalias/share/man/man8/rc.subr.8#7 integrate .. //depot/projects/soc2005/libalias/share/man/man9/Makefile#17 integrate .. //depot/projects/soc2005/libalias/share/man/man9/lock.9#8 integrate .. //depot/projects/soc2005/libalias/share/man/man9/rwlock.9#7 integrate .. //depot/projects/soc2005/libalias/share/man/man9/sleep.9#4 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.lib.mk#8 integrate .. //depot/projects/soc2005/libalias/share/mk/sys.mk#6 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/intr_machdep.c#12 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux.h#11 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_dummy.c#8 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_proto.h#14 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_syscall.h#14 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysent.c#14 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysvec.c#12 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/syscalls.master#13 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/soc2005/libalias/sys/arm/arm/elf_trampoline.c#9 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/exception.S#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/intr.c#7 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/locore.S#6 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/kb920x_machdep.c#12 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/machdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/sa11x0/assabet_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/arm/sa11x0/files.sa11x0#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/sa11x0/sa11x0_io.c#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/ep80219_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/iq31244_machdep.c#9 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/obio_space.c#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/files.ixp425#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#18 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#18 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#18 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#18 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#18 integrate .. //depot/projects/soc2005/libalias/sys/compat/linprocfs/linprocfs.c#13 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_file.c#12 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_misc.c#20 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_stats.c#8 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_uid16.c#5 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_util.h#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/soc2005/libalias/sys/conf/Makefile.arm#6 integrate .. //depot/projects/soc2005/libalias/sys/conf/NOTES#32 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#37 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#29 integrate .. //depot/projects/soc2005/libalias/sys/dev/aac/aac.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/soc2005/libalias/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/atkbdc/psm.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#23 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/de/if_de.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_80003es2lan.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_82540.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_82541.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_82542.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_82543.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_82571.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_82571.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_api.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_api.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_defines.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_hw.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_mac.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_mac.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_manage.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_nvm.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_nvm.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_phy.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/e1000_phy.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#20 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.h#13 integrate .. //depot/projects/soc2005/libalias/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/ip1000phy.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/miidevs#15 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt.c#11 integrate .. //depot/projects/soc2005/libalias/sys/dev/mxge/if_mxge.c#14 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfe.c#12 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfereg.h#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/ral/rt2661.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#18 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ehci_pci.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ubsa.c#10 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#18 integrate .. //depot/projects/soc2005/libalias/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/soc2005/libalias/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate .. //depot/projects/soc2005/libalias/sys/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/soc2005/libalias/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/soc2005/libalias/sys/fs/unionfs/union_vfsops.c#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/intr_machdep.c#10 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/pmap.c#15 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux.h#10 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_dummy.c#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_proto.h#16 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_syscall.h#15 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysent.c#15 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysvec.c#9 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/syscalls.master#15 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/interrupt.c#8 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/machdep.c#14 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/pmap.c#11 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/soc2005/libalias/sys/ia64/include/md_var.h#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/init_sysent.c#18 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_clock.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_conf.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_cpuset.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_event.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_exec.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_intr.c#12 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_jail.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_lock.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_lockf.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_timeout.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_umtx.c#15 integrate .. //depot/projects/soc2005/libalias/sys/kern/sched_ule.c#17 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_firmware.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_sleepqueue.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.c#18 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.master#18 integrate .. //depot/projects/soc2005/libalias/sys/kern/systrace_args.c#15 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_acl.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_extattr.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#20 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_syscalls.c#16 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#23 integrate .. //depot/projects/soc2005/libalias/sys/modules/asmc/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/em/Makefile#5 integrate .. //depot/projects/soc2005/libalias/sys/modules/igb/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/net/bpf.c#12 integrate .. //depot/projects/soc2005/libalias/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_loop.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.c#15 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_input.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_ipsec.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_ipsec.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#27 edit .. //depot/projects/soc2005/libalias/sys/netinet/tcp.h#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_pcb.c#8 integrate .. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/soc2005/libalias/sys/pc98/cbus/sc_machdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/pc98/cbus/syscons_cbus.c#5 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_rl.c#10 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_rlreg.h#13 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/asm.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/atomic.h#5 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/intr_machdep.c#10 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/psim/openpic_iobus.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_syscalls.c#5 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/intr_machdep.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/smp.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/intr_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/intr_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/_lockmgr.h#1 branch .. //depot/projects/soc2005/libalias/sys/sys/_stack.h#1 branch .. //depot/projects/soc2005/libalias/sys/sys/callout.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/cpuset.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/eventhandler.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/fcntl.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/imgact.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/interrupt.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/kernel.h#9 integrate .. //depot/projects/soc2005/libalias/sys/sys/lockmgr.h#9 integrate .. //depot/projects/soc2005/libalias/sys/sys/namei.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#24 integrate .. //depot/projects/soc2005/libalias/sys/sys/proc.h#19 integrate .. //depot/projects/soc2005/libalias/sys/sys/rwlock.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/sleepqueue.h#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/stack.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/stat.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.h#18 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.mk#18 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysproto.h#18 integrate .. //depot/projects/soc2005/libalias/sys/sys/time.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/umtx.h#11 integrate .. //depot/projects/soc2005/libalias/sys/sys/vnode.h#13 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_snapshot.c#11 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_gjournal.c#3 integrate .. //depot/projects/soc2005/libalias/sys/vm/uma.h#4 integrate .. //depot/projects/soc2005/libalias/sys/vm/uma_core.c#8 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_kern.c#7 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_map.c#10 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_page.c#17 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_phys.c#4 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/lib/msun/Makefile#4 integrate .. //depot/projects/soc2005/libalias/tools/regression/lib/msun/test-csqrt.c#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/lib/msun/test-fma.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/lib/msun/test-fma.t#1 branch .. //depot/projects/soc2005/libalias/tools/regression/lib/msun/test-rem.c#3 integrate .. //depot/projects/soc2005/libalias/tools/tools/README#6 integrate .. //depot/projects/soc2005/libalias/tools/tools/mctest/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.1#1 branch .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.cc#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.h#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/gprof/gprof.h#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/kdump.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/kdump.c#9 integrate .. //depot/projects/soc2005/libalias/usr.bin/ktrace/ktrace.1#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/ktrace/ktrace.c#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/xlint/lint1/param.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_reader/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/Makefile#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/Makefile#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/README#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/check.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/common.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/extern.h#3 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/gzip.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/gzip.h#3 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/main.c#3 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/pgp.h#3 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/pgp_check.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/pgp_sign.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/pkg_sign.1#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/sha1.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/sign.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/stand.c#3 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/stand.h#3 delete .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/sign/x509.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/lockd.c#8 integrate .. //depot/projects/soc2005/libalias/usr.sbin/rpc.statd/statd.c#6 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/devices.c#7 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/menus.c#6 integrate Differences ... ==== //depot/projects/soc2005/libalias/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $ +# $FreeBSD: src/Makefile,v 1.347 2008/03/31 13:32:55 pav Exp $ # # The user-driven targets are: # @@ -36,7 +36,7 @@ # The user-driven targets (as listed above) are implemented in Makefile.inc1. # # If you want to build your system from source be sure that /usr/obj has -# at least 400MB of diskspace available. +# at least 800MB of diskspace available. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#29 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.135 2008/03/29 17:44:38 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080331: pkg_sign has been removed +OLD_FILES+=usr/sbin/pkg_check +OLD_FILES+=usr/sbin/pkg_sign +OLD_FILES+=usr/share/man/man1/pkg_check.1.gz +OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz # 20080220: geom_lvm rename to geom_linux_lvm OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal ==== //depot/projects/soc2005/libalias/UPDATING#25 (text+ko) ==== @@ -22,6 +22,13 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080408: + psm(4) has gained write(2) support in native operation level. + Arbitrary commands can be written to /dev/psm%d and status can + be read back from it. Therefore, an application is responsible + for status validation and error recovery. It is a no-op in + other operation levels. + 20080312: Support for KSE threading has been removed from the kernel. To run legacy applications linked against KSE libmap.conf may @@ -1007,4 +1014,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ +$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $ ==== //depot/projects/soc2005/libalias/bin/ls/ls.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $ .\" -.Dd October 12, 2006 +.Dd April 4, 2008 .Dt LS 1 .Os .Sh NAME @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1 +.Op Fl D Ar format .Op Ar .Sh DESCRIPTION For each operand that names a @@ -88,6 +89,21 @@ is the numeric value of the character in octal. .It Fl C Force multi-column output; this is the default when output is to a terminal. +.It Fl D Ar format +When printing in the long +.Pq Fl l +format, use +.Ar format +to format the date and time output. +The argument +.Ar format +is a string used by +.Xr strftime 3 . +Depending on the choice of format string, this may result in a +different number of columns in the output. +This option overrides the +.Fl T +option. .It Fl F Display a slash .Pq Ql / @@ -146,12 +162,13 @@ Sort by size (largest file first) before sorting the operands in lexicographical order. .It Fl T -When used with the -.Fl l -(lowercase letter -.Dq ell ) -option, display complete time information for the file, including +When printing in the long +.Pq Fl l +format, display complete time information for the file, including month, day, hour, minute, second, and year. +The +.Fl D +option gives even more control over the output format. .It Fl U Use time when file was created for sorting or printing. .It Fl W @@ -325,7 +342,12 @@ modified, and the pathname. .Pp If the modification time of the file is more than 6 months -in the past or future, then the year of the last modification +in the past or future, and the +.Fl D +or +.Fl T +are not specified, +then the year of the last modification is displayed in place of the hour and minute fields. .Pp If the owner or group names are not a known user or group name, @@ -657,6 +679,7 @@ .Xr getfacl 1 , .Xr sort 1 , .Xr xterm 1 , +.Xr strftime 3 , .Xr termcap 5 , .Xr maclabel 7 , .Xr symlink 7 , ==== //depot/projects/soc2005/libalias/bin/ls/ls.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $"); #include #include @@ -125,10 +125,11 @@ static int f_singlecol; /* use single column output */ int f_size; /* list size in short listing */ int f_slash; /* similar to f_type, but only for dirs */ - int f_sortacross; /* sort across rows, not down columns */ + int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ + char *f_timeformat; /* user-specified time format */ static int f_sizesort; int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -179,7 +180,7 @@ fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCD:FGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -198,6 +199,9 @@ case 'C': f_sortacross = f_longform = f_singlecol = 0; break; + case 'D': + f_timeformat = optarg; + break; case 'l': f_longform = 1; f_singlecol = 0; ==== //depot/projects/soc2005/libalias/bin/ls/ls.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $ */ #define NO_PRINT 1 @@ -50,8 +50,9 @@ extern int f_sectime; /* print the real time for all files */ extern int f_size; /* list size in short listing */ extern int f_slash; /* append a '/' if the file is a directory */ -extern int f_sortacross; /* sort across rows, not down columns */ +extern int f_sortacross; /* sort across rows, not down columns */ extern int f_statustime; /* use time of last mode change */ +extern char *f_timeformat; /* user-specified time format */ extern int f_notabs; /* don't use tab-separated multi-col output */ extern int f_type; /* add type character for non-regular files */ #ifdef COLORLS ==== //depot/projects/soc2005/libalias/bin/ls/print.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $"); #include #include @@ -237,7 +237,7 @@ if (chcnt) putchar('\n'); } - + void printcol(const DISPLAY *dp) { @@ -378,17 +378,20 @@ now = time(NULL); #define SIXMONTHS ((365 / 2) * 86400) - if (f_sectime) + if (f_timeformat) /* user specified format */ + format = f_timeformat; + else if (f_sectime) /* mmm dd hh:mm:ss yyyy || dd mmm hh:mm:ss yyyy */ - format = d_first ? "%e %b %T %Y " : "%b %e %T %Y "; + format = d_first ? "%e %b %T %Y" : "%b %e %T %Y"; else if (ftime + SIXMONTHS > now && ftime < now + SIXMONTHS) /* mmm dd hh:mm || dd mmm hh:mm */ - format = d_first ? "%e %b %R " : "%b %e %R "; + format = d_first ? "%e %b %R" : "%b %e %R"; else /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y " : "%b %e %Y "; + format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); + fputc(' ', stdout); } static int @@ -625,7 +628,7 @@ snprintf(name, sizeof(name), "%s", p->fts_name); else snprintf(name, sizeof(name), "%s/%s", - p->fts_parent->fts_accpath, p->fts_name); + p->fts_parent->fts_accpath, p->fts_name); /* * We have no way to tell whether a symbolic link has an ACL since * pathconf() and acl_get_file() both follow them. They also don't ==== //depot/projects/soc2005/libalias/bin/ls/util.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.40 2006/03/24 16:38:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.41 2008/04/04 05:55:42 ru Exp $"); #include #include @@ -222,9 +222,9 @@ { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #else - "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #endif " [file ...]\n"); exit(1); ==== //depot/projects/soc2005/libalias/contrib/netcat/nc.1#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.7 2007/03/28 01:57:03 delphij Exp $ +.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.8 2008/04/01 13:54:24 bms Exp $ .\" -.Dd May 21, 2006 +.Dd April 2, 2008 .Dt NC 1 .Os .Sh NAME @@ -36,7 +36,7 @@ .Sh SYNOPSIS .Nm nc .Bk -words -.Op Fl 46DEdhklnorStUuvz +.Op Fl 46DEdhklnoOrStUuvz .Op Fl e Ar IPsec_policy .Op Fl i Ar interval .Op Fl P Ar proxy_username @@ -146,6 +146,7 @@ .It Fl n Do not do any DNS or service lookups on any specified addresses, hostnames or ports. +.\" .It Fl o .Dq Once-only mode . By default, @@ -155,6 +156,10 @@ Specifying .Fl o will make it terminate on EOF as well. +.It Fl o +Disables the use of TCP options on the socket, by setting the boolean +TCP_NOOPT +socket option. .It Fl P Ar proxy_username Specifies a username to present to a proxy server that requires authentication. If no username is specified then authentication will not be attempted. @@ -435,7 +440,8 @@ .Dl $ nc -x10.2.3.4:8080 -Xconnect -Pruser host.example.com 42 .Sh SEE ALSO .Xr cat 1 , -.Xr ssh 1 +.Xr ssh 1 , +.Xr tcp 4 .Sh AUTHORS Original implementation by *Hobbit* .Aq hobbit@avian.org . ==== //depot/projects/soc2005/libalias/contrib/netcat/netcat.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/contrib/netcat/netcat.c,v 1.6 2007/07/01 12:08:04 gnn Exp $ + * $FreeBSD: src/contrib/netcat/netcat.c,v 1.7 2008/04/01 13:54:24 bms Exp $ */ /* @@ -78,6 +78,7 @@ int lflag; /* Bind to local port */ int nflag; /* Don't do name look up */ int oflag; /* Once only: stop on EOF */ +int Oflag; /* Do not use TCP options */ char *Pflag; /* Proxy username */ char *pflag; /* Localport flag */ int rflag; /* Random ports flag */ @@ -138,7 +139,7 @@ sv = NULL; while ((ch = getopt(argc, argv, - "46e:DEdhi:jklnoP:p:rSs:tT:Uuvw:X:x:z")) != -1) { + "46e:DEdhi:jklnoOP:p:rSs:tT:Uuvw:X:x:z")) != -1) { switch (ch) { case '4': family = AF_INET; @@ -202,6 +203,9 @@ case 'o': oflag = 1; break; + case 'O': + Oflag = 1; + break; case 'P': Pflag = optarg; break; @@ -600,6 +604,11 @@ if (ipsec_policy[1] != NULL) add_ipsec_policy(s, ipsec_policy[1]); #endif + if (Oflag) { + if (setsockopt(s, IPPROTO_TCP, TCP_NOOPT, + &Oflag, sizeof(Oflag)) == -1) + err(1, "disable TCP options"); + } if (bind(s, (struct sockaddr *)res0->ai_addr, res0->ai_addrlen) == 0) @@ -829,6 +838,11 @@ &Tflag, sizeof(Tflag)) == -1) err(1, "set IP ToS"); } + if (Oflag) { + if (setsockopt(s, IPPROTO_TCP, TCP_NOOPT, + &Oflag, sizeof(Oflag)) == -1) + err(1, "disable TCP options"); + } } int @@ -868,6 +882,7 @@ \t-k Keep inbound sockets open for multiple connects\n\ \t-l Listen mode, for inbound connects\n\ \t-n Suppress name/port resolutions\n\ + \t-O Disable TCP options\n\ \t-P proxyuser\tUsername for proxy authentication\n\ \t-p port\t Specify local port for remote connects\n\ \t-r Randomize remote ports\n\ @@ -915,9 +930,9 @@ usage(int ret) { #ifdef IPSEC - fprintf(stderr, "usage: nc [-46DEdhklnrStUuvz] [-e policy] [-i interval] [-P proxy_username] [-p source_port]\n"); + fprintf(stderr, "usage: nc [-46DEdhklnorStUuvz] [-e policy] [-i interval] [-P proxy_username] [-p source_port]\n"); #else - fprintf(stderr, "usage: nc [-46DdhklnrStUuvz] [-i interval] [-P proxy_username] [-p source_port]\n"); + fprintf(stderr, "usage: nc [-46DdhklnorStUuvz] [-i interval] [-P proxy_username] [-p source_port]\n"); #endif fprintf(stderr, "\t [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n"); fprintf(stderr, "\t [-x proxy_address[:port]] [hostname] [port[s]]\n"); ==== //depot/projects/soc2005/libalias/etc/defaults/rc.conf#19 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -105,6 +105,10 @@ #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. +wpa_supplicant_program="/usr/sbin/wpa_supplicant" +wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant +wpa_supplicant_conf_file="/etc/wpa_supplicant.conf" +# firewall_enable="NO" # Set to YES to enable firewall functionality firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) @@ -379,6 +383,19 @@ bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file +rfcomm_pppd_server_enable="NO" # Enable rfcomm_pppd(8) in server mode (or NO) +rfcomm_pppd_server_profile="one two" # Profile to use from /etc/ppp/ppp.conf +# +#rfcomm_pppd_server_one_bdaddr="" # Override local bdaddr for 'one' +rfcomm_pppd_server_one_channel="1" # Override local channel for 'one' +#rfcomm_pppd_server_one_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_one_register_dun="NO" # for 'one' +# +#rfcomm_pppd_server_two_bdaddr="" # Override local bdaddr for 'two' +rfcomm_pppd_server_two_channel="3" # Override local channel for 'two' +#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_two_register_dun="NO" # for 'two' + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ==== //depot/projects/soc2005/libalias/etc/rc.d/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.90 2008/04/08 23:34:12 emax Exp $ .include @@ -29,7 +29,7 @@ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - random rarpd resolv root \ + random rarpd resolv rfcomm_pppd_server root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ serial sppp statd swap1 \ ==== //depot/projects/soc2005/libalias/etc/rc.d/ppp#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.18 2008/03/28 07:57:51 brooks Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.20 2008/04/10 01:32:49 brooks Exp $ # # PROVIDE: ppp @@ -19,6 +19,7 @@ ppp_start_profile() { local _ppp_profile _ppp_mode _ppp_nat _ppp_unit + local _ppp_profile_cleaned _punct _punct_c _ppp_profile=$1 _ppp_profile_cleaned=$1 @@ -61,7 +62,7 @@ # Check for hard wired unit eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit - if [ -n "_ppp_unit" ]; then + if [ -n "${_ppp_unit}" ]; then _ppp_unit="-unit${_ppp_unit}" fi rc_flags="$rc_flags $_ppp_unit" ==== //depot/projects/soc2005/libalias/etc/rc.d/wpa_supplicant#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.2 2005/10/19 22:26:47 jkim Exp $ +# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $ # # PROVIDE: wpa_supplicant @@ -12,27 +12,43 @@ name="wpa_supplicant" rcvar= -command="/usr/sbin/${name}" -conf_file="/etc/wpa_supplicant.conf" ifn="$2" if [ -z "$ifn" ]; then return 1 fi +is_wired_interface() +{ + media=`ifconfig $1 2>/dev/null | while read line; do + case "$line" in + *media:?Ethernet*) + echo Ethernet + ;; + esac + done` + test "$media" = "Ethernet" +} + case ${ifn} in ndis*) driver="ndis" ;; *) - driver="bsd" + if is_wired_interface ${ifn} ; then + driver="wired" + else + driver="bsd" + fi ;; esac load_rc_config $name -pid_file="/var/run/${name}/${ifn}.pid" -command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file" +command=${wpa_supplicant_program} +conf_file=${wpa_supplicant_conf_file} +pidfile="/var/run/${name}/${ifn}.pid" +command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file run_rc_command "$1" ==== //depot/projects/soc2005/libalias/etc/rc.d/zfs#5 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/zfs,v 1.6 2008/03/19 14:44:55 pjd Exp $ +# $FreeBSD: src/etc/rc.d/zfs,v 1.7 2008/04/02 19:29:16 dougb Exp $ # # PROVIDE: zfs # REQUIRE: mountcritlocal -# BEFORE: mountcritremote . /etc/rc.subr ==== //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#17 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.258 2008/03/03 10:06:52 dds Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.260 2008/04/03 10:22:56 yar Exp $ % ======================================================================= || || @@ -11483,6 +11483,14 @@ % As Zeus said to Narcissus, "Watch yourself." >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 10 17:11:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 275C61065674; Thu, 10 Apr 2008 17:11:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE5D41065671 for ; Thu, 10 Apr 2008 17:11:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCBB48FC14 for ; Thu, 10 Apr 2008 17:11:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3AHBrce007233 for ; Thu, 10 Apr 2008 17:11:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3AHBr9r007231 for perforce@freebsd.org; Thu, 10 Apr 2008 17:11:53 GMT (envelope-from sam@freebsd.org) Date: Thu, 10 Apr 2008 17:11:53 GMT Message-Id: <200804101711.m3AHBr9r007231@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 Cc: Subject: PERFORCE change 139749 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2008 17:11:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=139749 Change 139749 by sam@sam_ebb on 2008/04/10 17:11:10 strip wlan_scan_sta and awi Affected files ... .. //depot/projects/vap/sys/amd64/conf/GENERIC#12 edit .. //depot/projects/vap/sys/arm/conf/AVILA#9 edit .. //depot/projects/vap/sys/arm/conf/HL200#6 edit .. //depot/projects/vap/sys/arm/conf/KB920X#6 edit .. //depot/projects/vap/sys/i386/conf/GENERIC#12 edit .. //depot/projects/vap/sys/pc98/conf/GENERIC#10 edit .. //depot/projects/vap/sys/sparc64/conf/GENERIC#11 edit Differences ... ==== //depot/projects/vap/sys/amd64/conf/GENERIC#12 (text+ko) ==== @@ -239,12 +239,10 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device wlan_scan_sta # 802.11 STA mode scanning device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) device ath_rate_sample # SampleRate tx rate control for ath -device awi # BayStack 660 and others device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. ==== //depot/projects/vap/sys/arm/conf/AVILA#9 (text+ko) ==== @@ -130,7 +130,6 @@ device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support -device wlan_scan_sta device wlan_xauth device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) ==== //depot/projects/vap/sys/arm/conf/HL200#6 (text+ko) ==== @@ -147,4 +147,3 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device wlan_scan_sta # 802.11 STA mode scanning ==== //depot/projects/vap/sys/arm/conf/KB920X#6 (text) ==== @@ -135,4 +135,3 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device wlan_scan_sta # 802.11 STA mode scanning ==== //depot/projects/vap/sys/i386/conf/GENERIC#12 (text+ko) ==== @@ -254,7 +254,6 @@ device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm device wlan_rssadapt # RSSADAPT transmit rate control algorithm -device wlan_scan_sta # 802.11 STA mode scanning device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) ==== //depot/projects/vap/sys/pc98/conf/GENERIC#10 (text+ko) ==== @@ -215,12 +215,10 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device wlan_scan_sta # 802.11 STA mode scanning device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) device ath_rate_sample # SampleRate tx rate control for ath -device awi # BayStack 660 and others device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. #device wl # Older non 802.11 Wavelan wireless NIC. ==== //depot/projects/vap/sys/sparc64/conf/GENERIC#11 (text+ko) ==== @@ -195,7 +195,6 @@ device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support -device wlan_scan_sta # 802.11 STA mode scanning device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) device ath_rate_sample # SampleRate tx rate control for ath From owner-p4-projects@FreeBSD.ORG Thu Apr 10 17:23:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A01271065671; Thu, 10 Apr 2008 17:23:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FE2F106564A for ; Thu, 10 Apr 2008 17:23:05 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E22A8FC13 for ; Thu, 10 Apr 2008 17:23:05 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3AHN5iq007543 for ; Thu, 10 Apr 2008 17:23:05 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3AHN5nw007541 for perforce@freebsd.org; Thu, 10 Apr 2008 17:23:05 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 10 Apr 2008 17:23:05 GMT Message-Id: <200804101723.m3AHN5nw007541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 139750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2008 17:23:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=139750 Change 139750 by gonzo@gonzo_jeeves on 2008/04/10 17:22:22 o Use generic TARGET_BIG_ENDIAN knob to set endianess instead of custom MIPS_LITTLE_ENDIAN. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/Makefile.mips#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/Makefile.mips#3 (text+ko) ==== @@ -39,14 +39,14 @@ ARCH_FLAGS?=-march=mips32 HACK_EXTRA_FLAGS=-shared -.if defined(MIPS_LITTLE_ENDIAN) +.if defined(TARGET_BIG_ENDIAN) +CFLAGS+=-EB +SYSTEM_LD+=-EB +HACK_EXTRA_FLAGS+=-EB -Wl,-EB +.else CFLAGS+=-EL SYSTEM_LD+=-EL HACK_EXTRA_FLAGS+=-EL -Wl,-EL -.else -CFLAGS+=-EB -SYSTEM_LD+=-EB -HACK_EXTRA_FLAGS+=-EB -Wl,-EB .endif # We add the -fno-pic flag to kernels because otherwise performance From owner-p4-projects@FreeBSD.ORG Thu Apr 10 23:22:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C51111065670; Thu, 10 Apr 2008 23:22:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87879106564A for ; Thu, 10 Apr 2008 23:22:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7AF688FC1C for ; Thu, 10 Apr 2008 23:22:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3ANMFvj052505 for ; Thu, 10 Apr 2008 23:22:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3ANMFcE052503 for perforce@freebsd.org; Thu, 10 Apr 2008 23:22:15 GMT (envelope-from sam@freebsd.org) Date: Thu, 10 Apr 2008 23:22:15 GMT Message-Id: <200804102322.m3ANMFcE052503@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 Cc: Subject: PERFORCE change 139766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2008 23:22:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=139766 Change 139766 by sam@sam_ebb on 2008/04/10 23:22:11 catch up w/ ioctl changes; can't reference ni_chan except in RUN state Affected files ... .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#5 edit Differences ... ==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#5 (text+ko) ==== @@ -1078,6 +1078,8 @@ enum ieee80211_phymode mode; MWL_HAL_TXRATE rates; + KASSERT(vap->iv_state == IEEE80211_S_RUN, ("state %d", vap->iv_state)); + mode = ieee80211_chan2mode(ni->ni_chan); /* * Use legacy rates when operating a mixed HT+non-HT bss. @@ -1116,6 +1118,8 @@ enum ieee80211_phymode mode; uint8_t rate; + KASSERT(vap->iv_state == IEEE80211_S_RUN, ("state %d", vap->iv_state)); + mode = ieee80211_chan2mode(ni->ni_chan); /* * Use legacy rates when operating a mixed HT+non-HT bss. @@ -1298,7 +1302,8 @@ struct mwl_hal_vap *hvap = MWL_VAP(vap)->mv_hvap; struct ieee80211com *ic = vap->iv_ic; - mwl_setrates(vap); + if (state == IEEE80211_S_RUN) + mwl_setrates(vap); /* XXX off by 1? */ mwl_hal_setrtsthreshold(hvap, vap->iv_rtsthreshold); /* XXX auto? 20/40 split? */ From owner-p4-projects@FreeBSD.ORG Fri Apr 11 05:47:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63CA11065671; Fri, 11 Apr 2008 05:47:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24FBD106566B for ; Fri, 11 Apr 2008 05:47:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1AB1B8FC16 for ; Fri, 11 Apr 2008 05:47:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3B5l34s028923 for ; Fri, 11 Apr 2008 05:47:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3B5l3lE028921 for perforce@freebsd.org; Fri, 11 Apr 2008 05:47:03 GMT (envelope-from sam@freebsd.org) Date: Fri, 11 Apr 2008 05:47:03 GMT Message-Id: <200804110547.m3B5l3lE028921@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 Cc: Subject: PERFORCE change 139779 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 05:47:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=139779 Change 139779 by sam@sam_ebb on 2008/04/11 05:46:03 o must grab softc lock when submitting device cmd in wme callback o add lock assert in iwn_cmd to catch any other cases o split iwn_stop to create locked variant and use it to eliminate some recursive locking o pull softc lock up higher in iwn_ops to cover debug printf (to avoid msg intermingling on smp) and to simplify logic o return consistently after canceling scan (needs overhaul) Affected files ... .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#8 edit Differences ... ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#8 (text+kox) ==== @@ -2649,6 +2649,8 @@ struct iwn_tx_cmd *cmd; bus_addr_t paddr; + IWN_LOCK_ASSERT(sc); + KASSERT(size <= sizeof cmd->data, ("Command too big")); desc = &ring->desc[ring->cur]; @@ -2819,7 +2821,10 @@ cmd.ac[i].txoplimit = htole16(IWN_TXOP_TO_US(wmep->wmep_txopLimit)); } - return iwn_cmd(sc, IWN_CMD_EDCA_PARAMS, &cmd, sizeof cmd, 1); + IWN_LOCK(sc); + (void) iwn_cmd(sc, IWN_CMD_EDCA_PARAMS, &cmd, sizeof cmd, 1 /*async*/); + IWN_UNLOCK(sc); + return 0; #undef IWN_TXOP_TO_US #undef IWN_EXP2 } @@ -4229,14 +4234,14 @@ IWN_UNLOCK(sc); } -void -iwn_stop(struct iwn_softc *sc) +static void +iwn_stop_locked(struct iwn_softc *sc) { struct ifnet *ifp = sc->sc_ifp; uint32_t tmp; int i; - IWN_LOCK(sc); + IWN_LOCK_ASSERT(sc); IWN_WRITE(sc, IWN_RESET, IWN_NEVO_RESET); @@ -4268,7 +4273,13 @@ tmp = IWN_READ(sc, IWN_RESET); IWN_WRITE(sc, IWN_RESET, tmp | IWN_SW_RESET); +} +void +iwn_stop(struct iwn_softc *sc) +{ + IWN_LOCK(sc); + iwn_stop_locked(sc); IWN_UNLOCK(sc); } @@ -4369,16 +4380,15 @@ sc->sc_cmd_cur = (sc->sc_cmd_cur + 1) % IWN_CMD_MAXOPS; IWN_CMD_UNLOCK(sc); + IWN_LOCK(sc); /* NB: sync debug printfs on smp */ DPRINTF(sc, IWN_DEBUG_OPS, "%s: %s (cmd 0x%x)\n", __func__, iwn_ops_str(cmd), cmd); vap = TAILQ_FIRST(&ic->ic_vaps); /* XXX */ switch (cmd) { case IWN_SCAN_START: - IWN_LOCK(sc); /* make the link LED blink while we're scanning */ iwn_set_led(sc, IWN_LED_LINK, 20, 2); - IWN_UNLOCK(sc); break; case IWN_SCAN_STOP: break; @@ -4386,19 +4396,21 @@ ieee80211_scan_next(vap); break; case IWN_SCAN_CURCHAN: - IWN_LOCK(sc); error = iwn_scan(sc); - IWN_UNLOCK(sc); - if (error != 0) + if (error != 0) { + IWN_UNLOCK(sc); ieee80211_cancel_scan(vap); + IWN_LOCK(sc); + return; + } break; case IWN_SET_CHAN: - IWN_LOCK(sc); error = iwn_config(sc); - IWN_UNLOCK(sc); if (error != 0) { DPRINTF(sc, IWN_DEBUG_STATE, - "%s: cancel scan\n", __func__); + "%s: set chan failed, cancel scan\n", + __func__); + IWN_UNLOCK(sc); //XXX Handle failed scan correctly ieee80211_cancel_scan(vap); return; @@ -4406,7 +4418,6 @@ break; case IWN_AUTH: case IWN_RUN: - IWN_LOCK(sc); if (cmd == IWN_AUTH) { error = iwn_auth(sc); nstate = IEEE80211_S_AUTH; @@ -4414,13 +4425,14 @@ error = iwn_run(sc); nstate = IEEE80211_S_RUN; } - IWN_UNLOCK(sc); if (error == 0) { + IWN_UNLOCK(sc); IEEE80211_LOCK(ic); IWN_VAP(vap)->iv_newstate(vap, nstate, arg); if (vap->iv_newstate_cb != NULL) vap->iv_newstate_cb(vap, nstate, arg); IEEE80211_UNLOCK(ic); + IWN_LOCK(sc); } else { device_printf(sc->sc_dev, "%s: %s state change failed, error %d\n", @@ -4431,7 +4443,7 @@ case IWN_REINIT: //XXX DEBUG break; - iwn_stop(sc); + iwn_stop_locked(sc); iwn_init(sc); break; case IWN_RADIO_ENABLE: @@ -4440,9 +4452,10 @@ iwn_init(sc); break; case IWN_RADIO_DISABLE: - iwn_stop(sc); + iwn_stop_locked(sc); break; } + IWN_UNLOCK(sc); } } From owner-p4-projects@FreeBSD.ORG Fri Apr 11 06:07:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57A671065685; Fri, 11 Apr 2008 06:07:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A5EF1065683 for ; Fri, 11 Apr 2008 06:07:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1019D8FC0C for ; Fri, 11 Apr 2008 06:07:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3B67OHI032976 for ; Fri, 11 Apr 2008 06:07:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3B67OXq032965 for perforce@freebsd.org; Fri, 11 Apr 2008 06:07:24 GMT (envelope-from sam@freebsd.org) Date: Fri, 11 Apr 2008 06:07:24 GMT Message-Id: <200804110607.m3B67OXq032965@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 Cc: Subject: PERFORCE change 139781 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 06:07:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=139781 Change 139781 by sam@sam_ebb on 2008/04/11 06:07:07 o bounce beacon miss through a taskqueue to eliminate a LOR o hookup radio on/off to net80211 Affected files ... .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#9 edit .. //depot/projects/vap/sys/dev/iwn/if_iwnvar.h#6 edit Differences ... ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#9 (text+kox) ==== @@ -130,6 +130,7 @@ void iwn_rx_statistics(struct iwn_softc *, struct iwn_rx_desc *); void iwn_tx_intr(struct iwn_softc *, struct iwn_rx_desc *); void iwn_cmd_intr(struct iwn_softc *, struct iwn_rx_desc *); +static void iwn_bmiss(void *, int); void iwn_notif_intr(struct iwn_softc *); void iwn_intr(void *); void iwn_read_eeprom(struct iwn_softc *); @@ -300,7 +301,8 @@ taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq", device_get_nameunit(dev)); - TASK_INIT(&sc->sc_opstask, 0, iwn_ops, sc ); + TASK_INIT(&sc->sc_ops_task, 0, iwn_ops, sc ); + TASK_INIT(&sc->sc_bmiss_task, 0, iwn_bmiss, sc); /* * Put adapter into a known state. @@ -1647,6 +1649,15 @@ wakeup(&ring->cmd[desc->idx]); } +static void +iwn_bmiss(void *arg, int npending) +{ + struct iwn_softc *sc = arg; + struct ieee80211com *ic = sc->sc_ifp->if_l2com; + + ieee80211_beacon_miss(ic); +} + void iwn_notif_intr(struct iwn_softc *sc) { @@ -1707,7 +1718,8 @@ if (vap->iv_state == IEEE80211_S_RUN && misses > 5) (void) iwn_init_sensitivity(sc); if (misses >= vap->iv_bmissthreshold) - ieee80211_beacon_miss(ic); + taskqueue_enqueue(taskqueue_swi, + &sc->sc_bmiss_task); break; } case IWN_UC_READY: { @@ -1808,7 +1820,6 @@ iwn_queue_cmd(sc, IWN_RADIO_ENABLE, 0, IWN_QUEUE_CLEAR); else iwn_queue_cmd(sc, IWN_RADIO_DISABLE, 0, IWN_QUEUE_CLEAR); - } if (r1 & IWN_CT_REACHED) device_printf(sc->sc_dev, "critical temperature reached!\n"); @@ -4445,6 +4456,7 @@ break; iwn_stop_locked(sc); iwn_init(sc); + ieee80211_notify_radio(ic, 1); break; case IWN_RADIO_ENABLE: KASSERT(sc->fw_fp != NULL, @@ -4452,6 +4464,7 @@ iwn_init(sc); break; case IWN_RADIO_DISABLE: + ieee80211_notify_radio(ic, 0); iwn_stop_locked(sc); break; } @@ -4486,7 +4499,7 @@ sc->sc_cmd_arg[sc->sc_cmd_next] = arg; sc->sc_cmd_next = (sc->sc_cmd_next + 1) % IWN_CMD_MAXOPS; } - taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); + taskqueue_enqueue(sc->sc_tq, &sc->sc_ops_task); IWN_CMD_UNLOCK(sc); return 0; } ==== //depot/projects/vap/sys/dev/iwn/if_iwnvar.h#6 (text+kox) ==== @@ -204,7 +204,8 @@ struct taskqueue *sc_tq; /* Main command task queue */ /* Tasks used by the driver */ - struct task sc_opstask; /* operation handling task */ + struct task sc_ops_task; /* deferred ops */ + struct task sc_bmiss_task; /* beacon miss */ /* Thermal calibration */ int calib_cnt; From owner-p4-projects@FreeBSD.ORG Fri Apr 11 14:44:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7332C10656EC; Fri, 11 Apr 2008 14:44:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33EFD1065680 for ; Fri, 11 Apr 2008 14:44:31 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19E328FC20 for ; Fri, 11 Apr 2008 14:44:31 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BEiUPO036814 for ; Fri, 11 Apr 2008 14:44:31 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BEiU0q036812 for perforce@freebsd.org; Fri, 11 Apr 2008 14:44:30 GMT (envelope-from piso@freebsd.org) Date: Fri, 11 Apr 2008 14:44:30 GMT Message-Id: <200804111444.m3BEiU0q036812@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 139812 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 14:44:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=139812 Change 139812 by piso@piso_ferret on 2008/04/11 14:44:02 Reduce diff against head. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#28 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#28 (text+ko) ==== @@ -176,14 +176,12 @@ struct tcphdr *tc; int i; /* Iterator through the source */ - printf("here\n"); /* Calculate data length of TCP packet */ tc = (struct tcphdr *)ip_next(pip); hlen = (pip->ip_hl + tc->th_off) << 2; tlen = ntohs(pip->ip_len); dlen = tlen - hlen; - printf("here2\n"); /* * Return if data length is too short - assume an entire PRIVMSG in * each packet. @@ -191,14 +189,12 @@ if (dlen < (int)sizeof(":A!a@n.n PRIVMSG A :aDCC 1 1a") - 1) return; - printf("here3\n"); /* Place string pointer at beginning of data */ sptr = (char *)pip; sptr += hlen; maxsize -= hlen; /* We're interested in maximum size of * data, not packet */ - printf("here4\n"); /* Search for a CTCP command [Note 1] */ for (i = 0; i < dlen; i++) { if (sptr[i] == '\001') @@ -239,7 +235,6 @@ newpacket[iCopy++] = 'C'; newpacket[iCopy++] = 'C'; newpacket[iCopy++] = ' '; - printf("here7\n"); DBprintf(("Found DCC\n")); /* * Skip any extra spaces (should not occur according to @@ -251,7 +246,6 @@ goto lPACKET_DONE; } } - printf("here8\n"); DBprintf(("Transferring command...\n")); while (sptr[i] != ' ') { newpacket[iCopy++] = sptr[i]; @@ -260,12 +254,10 @@ goto lPACKET_DONE; } } - printf("here9\n"); /* Copy _one_ space */ if (i + 1 < dlen && iCopy < PKTSIZE) newpacket[iCopy++] = sptr[i++]; - printf("here10\n"); DBprintf(("Done command - removing spaces\n")); /* * Skip any extra spaces (should not occur according to @@ -277,7 +269,6 @@ goto lPACKET_DONE; } } - printf("here11\n"); DBprintf(("Transferring filename...\n")); while (sptr[i] != ' ') { newpacket[iCopy++] = sptr[i]; @@ -286,12 +277,10 @@ goto lPACKET_DONE; } } - printf("here12\n"); /* Copy _one_ space */ if (i + 1 < dlen && iCopy < PKTSIZE) newpacket[iCopy++] = sptr[i++]; - printf("here13\n"); DBprintf(("Done filename - removing spaces\n")); /* * Skip any extra spaces (should not occur according to @@ -303,7 +292,6 @@ goto lPACKET_DONE; } } - printf("here14\n"); DBprintf(("Fetching IP address\n")); /* Fetch IP address */ org_addr = 0; @@ -315,13 +303,11 @@ org_addr *= 10; org_addr += sptr[i++] - '0'; } - printf("here15\n"); DBprintf(("Skipping space\n")); if (i + 1 >= dlen || sptr[i] != ' ') { DBprintf(("Overflow (%d >= %d) or bad character (%02x) terminating IP address\n", i + 1, dlen, sptr[i])); goto lBAD_CTCP; } - printf("here16\n"); /* * Skip any extra spaces (should not occur according to * protocol, but DCC breaks CTCP protocol anyway, so we @@ -333,7 +319,6 @@ goto lPACKET_DONE; } } - printf("here17\n"); DBprintf(("Fetching port number\n")); /* Fetch source port */ org_port = 0; @@ -346,13 +331,11 @@ org_port *= 10; org_port += sptr[i++] - '0'; } - printf("here18\n"); /* Skip illegal addresses (or early termination) */ if (i >= dlen || (sptr[i] != '\001' && sptr[i] != ' ')) { DBprintf(("Bad port termination\n")); goto lBAD_CTCP; } - printf("here19\n"); DBprintf(("Got IP %lu and port %u\n", org_addr, (unsigned)org_port)); /* We've got the address and port - now alias it */ @@ -370,7 +353,6 @@ pip->ip_src.s_addr != true_addr.s_addr || org_port < IPPORT_RESERVED) goto lBAD_CTCP; - printf("here20\n"); /* * Steal the FTP_DATA_PORT - it doesn't really * matter, and this would probably allow it through @@ -380,14 +362,12 @@ true_port, 0, IPPROTO_TCP, 1); DBprintf(("Got a DCC link\n")); - printf("here21\n"); if (dcc_lnk) { struct in_addr alias_address; /* Address from aliasing */ u_short alias_port; /* Port given by * aliasing */ int n; - printf("here22\n"); #ifndef NO_FW_PUNCH /* Generate firewall hole as appropriate */ PunchFWHole(dcc_lnk); @@ -419,11 +399,9 @@ * Done - truncated cases will be taken * care of by lBAD_CTCP */ - printf("here24\n"); DBprintf(("Aliased IP %lu and port %u\n", alias_address.s_addr, (unsigned)alias_port)); } } - printf("here25\n"); /* * An uninteresting CTCP - state entered right after '\001' * has been pushed. Also used to copy the rest of a DCC, @@ -436,7 +414,6 @@ goto lNORMAL_TEXT; } } - printf("here26\n"); goto lPACKET_DONE; /* Normal text */ lNORMAL_TEXT: @@ -446,13 +423,11 @@ goto lCTCP_START; } } - printf("here27\n"); /* Handle the end of a packet */ lPACKET_DONE: iCopy = iCopy > maxsize - copyat ? maxsize - copyat : iCopy; memcpy(sptr + copyat, newpacket, iCopy); - printf("here28\n"); /* Save information regarding modified seq and ack numbers */ { int delta; @@ -462,7 +437,6 @@ delta = GetDeltaSeqOut(tc->th_seq, lnk); AddSeq(lnk, delta + copyat + iCopy - dlen, pip->ip_hl, pip->ip_len, tc->th_seq, tc->th_off); - printf("here29\n"); } /* Revise IP header */ @@ -475,7 +449,6 @@ &pip->ip_len, 1); pip->ip_len = new_len; - printf("here30\n"); } /* Compute TCP checksum for revised packet */ @@ -485,7 +458,6 @@ #else tc->th_sum = TcpChecksum(pip); #endif - printf("here31\n"); return; } } From owner-p4-projects@FreeBSD.ORG Fri Apr 11 14:47:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0F29106567B; Fri, 11 Apr 2008 14:47:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A22E91065675 for ; Fri, 11 Apr 2008 14:47:34 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8857C8FC22 for ; Fri, 11 Apr 2008 14:47:34 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BElYqt036946 for ; Fri, 11 Apr 2008 14:47:34 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BElYQc036944 for perforce@freebsd.org; Fri, 11 Apr 2008 14:47:34 GMT (envelope-from piso@freebsd.org) Date: Fri, 11 Apr 2008 14:47:34 GMT Message-Id: <200804111447.m3BElYQc036944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 139813 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 14:47:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=139813 Change 139813 by piso@piso_ferret on 2008/04/11 14:46:59 Whitespace redection. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#29 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#29 (text+ko) ==== @@ -215,7 +215,7 @@ if (i >= dlen || iCopy >= PKTSIZE) goto lPACKET_DONE; newpacket[iCopy++] = sptr[i++]; /* Copy the CTCP start - * character */ + * character */ /* Start of a CTCP */ if (i + 4 >= dlen) /* Too short for DCC */ goto lBAD_CTCP; @@ -235,6 +235,7 @@ newpacket[iCopy++] = 'C'; newpacket[iCopy++] = 'C'; newpacket[iCopy++] = ' '; + DBprintf(("Found DCC\n")); /* * Skip any extra spaces (should not occur according to @@ -246,6 +247,7 @@ goto lPACKET_DONE; } } + DBprintf(("Transferring command...\n")); while (sptr[i] != ' ') { newpacket[iCopy++] = sptr[i]; @@ -269,6 +271,7 @@ goto lPACKET_DONE; } } + DBprintf(("Transferring filename...\n")); while (sptr[i] != ' ') { newpacket[iCopy++] = sptr[i]; @@ -292,6 +295,7 @@ goto lPACKET_DONE; } } + DBprintf(("Fetching IP address\n")); /* Fetch IP address */ org_addr = 0; @@ -353,6 +357,7 @@ pip->ip_src.s_addr != true_addr.s_addr || org_port < IPPORT_RESERVED) goto lBAD_CTCP; + /* * Steal the FTP_DATA_PORT - it doesn't really * matter, and this would probably allow it through From owner-p4-projects@FreeBSD.ORG Fri Apr 11 14:57:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB4B71065674; Fri, 11 Apr 2008 14:57:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DFA61065671 for ; Fri, 11 Apr 2008 14:57:46 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 644308FC1A for ; Fri, 11 Apr 2008 14:57:46 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BEvkOo037445 for ; Fri, 11 Apr 2008 14:57:46 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BEvkH9037443 for perforce@freebsd.org; Fri, 11 Apr 2008 14:57:46 GMT (envelope-from piso@freebsd.org) Date: Fri, 11 Apr 2008 14:57:46 GMT Message-Id: <200804111457.m3BEvkH9037443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 139814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 14:57:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=139814 Change 139814 by piso@piso_ferret on 2008/04/11 14:57:42 With mbuf, we don't have any limit on packet size. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#9 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#9 (text+ko) ==== @@ -350,10 +350,10 @@ if (args->oif == NULL) retval = LibAliasIn(t->lib, &m, - MCLBYTES); + IP_MAXPACKET); else retval = LibAliasOut(t->lib, &m, - MCLBYTES); + IP_MAXPACKET); if (retval != PKT_ALIAS_OK) { printf("retval: %d", retval); /* XXX - should i add some logging? */ From owner-p4-projects@FreeBSD.ORG Fri Apr 11 15:27:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4E571065671; Fri, 11 Apr 2008 15:27:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 964CF106564A for ; Fri, 11 Apr 2008 15:27:18 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7BEBE8FC14 for ; Fri, 11 Apr 2008 15:27:18 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BFRIDe039805 for ; Fri, 11 Apr 2008 15:27:18 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BFRIDc039803 for perforce@freebsd.org; Fri, 11 Apr 2008 15:27:18 GMT (envelope-from piso@freebsd.org) Date: Fri, 11 Apr 2008 15:27:18 GMT Message-Id: <200804111527.m3BFRIDc039803@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 139816 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 15:27:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=139816 Change 139816 by piso@piso_ferret on 2008/04/11 15:26:24 Reduce diff against HEAD. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#77 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#77 (text+ko) ==== @@ -1255,7 +1255,6 @@ struct ip *pip; int iresult; - printf("%s()::%d\n", __FUNCTION__, __LINE__); if (la->packetAliasMode & PKT_ALIAS_REVERSE) { la->packetAliasMode &= ~PKT_ALIAS_REVERSE; iresult = LibAliasOutLocked(la, ptr, maxpacketsize, 1); @@ -1383,7 +1382,6 @@ struct in_addr addr_save; struct ip *pip; - printf("%s()::%d\n", __FUNCTION__, __LINE__); if (la->packetAliasMode & PKT_ALIAS_REVERSE) { la->packetAliasMode &= ~PKT_ALIAS_REVERSE; iresult = LibAliasInLocked(la, ptr, maxpacketsize); From owner-p4-projects@FreeBSD.ORG Fri Apr 11 15:34:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81E501065673; Fri, 11 Apr 2008 15:34:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43DF01065671 for ; Fri, 11 Apr 2008 15:34:26 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2974B8FC0A for ; Fri, 11 Apr 2008 15:34:26 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BFYQ8Z040256 for ; Fri, 11 Apr 2008 15:34:26 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BFYQrL040254 for perforce@freebsd.org; Fri, 11 Apr 2008 15:34:26 GMT (envelope-from piso@freebsd.org) Date: Fri, 11 Apr 2008 15:34:26 GMT Message-Id: <200804111534.m3BFYQrL040254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 139818 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 15:34:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=139818 Change 139818 by piso@piso_ferret on 2008/04/11 15:34:17 Reduce diff against HEAD. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#10 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#10 (text+ko) ==== @@ -259,12 +259,9 @@ NULL) goto badnat; ip = mtod(m, struct ip *); - printf("%s()::%d - ip_off: %d ip_len: %d mlen: %d\n", __FUNCTION__, __LINE__, - ip->ip_off, ip->ip_len, m->m_len); if (ip->ip_off & (IP_MF | IP_OFFMASK)) { struct mbuf *reass; - printf("fragment found\n"); /* Reassemble packet. */ reass = ip_reass(m); @@ -286,7 +283,6 @@ ip->ip_sum = in_cksum(reass, hlen); m = reass; } else { - printf("can't reass\n"); m = NULL; goto badnat; } From owner-p4-projects@FreeBSD.ORG Fri Apr 11 15:48:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 737051065671; Fri, 11 Apr 2008 15:48:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3547D106566B for ; Fri, 11 Apr 2008 15:48:41 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1A6708FC1A for ; Fri, 11 Apr 2008 15:48:41 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BFmfbE040727 for ; Fri, 11 Apr 2008 15:48:41 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BFme5r040725 for perforce@freebsd.org; Fri, 11 Apr 2008 15:48:40 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 11 Apr 2008 15:48:40 GMT Message-Id: <200804111548.m3BFme5r040725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 139820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 15:48:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=139820 Change 139820 by gonzo@gonzo_jeeves on 2008/04/11 15:47:49 o Set HAZARD_DELAY to 5 cycles for all machines till we figure out the way to do it platform-wise. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#23 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#23 (text+ko) ==== @@ -96,17 +96,14 @@ .set mips3 #endif -#define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; /* - * FREEBSD_DEVELOPERS_FIXME - * Some MIPS CPU may need delays using nops between executing CP0 Instructions + * Assume that w alaways need nops to escape CP0 hazard + * TODO: Make hazard delays configurable. Stuck with 5 cycles on the moment + * For more info on CP0 hazards see Chapter 7 (p.99) of "MIPS32 Architecture + * For Programmers Volume III: The MIPS32 Privileged Resource Architecture" */ -#ifdef MIPS_CPU_NEEDS_DELAY -#define HAZARD_DELAY nop ; nop ; nop ; nop -#else -#define HAZARD_DELAY -#endif - +#define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; +#define HAZARD_DELAY nop;nop;nop;nop;nop; /* *---------------------------------------------------------------------------- From owner-p4-projects@FreeBSD.ORG Fri Apr 11 16:27:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 351A9106564A; Fri, 11 Apr 2008 16:27:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BAC071065674 for ; Fri, 11 Apr 2008 16:27:22 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A01308FC1E for ; Fri, 11 Apr 2008 16:27:22 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BGRM5s043059 for ; Fri, 11 Apr 2008 16:27:22 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BGRMtu043057 for perforce@freebsd.org; Fri, 11 Apr 2008 16:27:22 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 11 Apr 2008 16:27:22 GMT Message-Id: <200804111627.m3BGRMtu043057@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 16:27:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=139821 Change 139821 by pgj@disznohal on 2008/04/11 16:26:51 Fix translation. Affected files ... .. //depot/projects/docproj_hu/books/handbook/mail/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/mail/chapter.sgml#3 (text+ko) ==== @@ -2121,10 +2121,10 @@ levelezõ szervernek vagy STMP szervernek nevezik). - Ne felejtsük el a sendmail - esetében sem beállítani, hogy ne kezelje a - kimenõ leveleket. Ennek részleteit ld. . + Ne felejtsük el sendmail + démont sem letiltani, beleértve a kimenõ + levelek kezelését. Ennek részleteit ld. a + ban. A mail/ssmtp használatánál még adhatunk meg From owner-p4-projects@FreeBSD.ORG Fri Apr 11 17:10:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 352121065670; Fri, 11 Apr 2008 17:10:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E96E31065672 for ; Fri, 11 Apr 2008 17:10:08 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B471C8FC14 for ; Fri, 11 Apr 2008 17:10:08 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BHA8GK054648 for ; Fri, 11 Apr 2008 17:10:08 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BHA8Ai054646 for perforce@freebsd.org; Fri, 11 Apr 2008 17:10:08 GMT (envelope-from rrs@cisco.com) Date: Fri, 11 Apr 2008 17:10:08 GMT Message-Id: <200804111710.m3BHA8Ai054646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 139823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 17:10:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=139823 Change 139823 by rrs@rrs-mips2-jnpr on 2008/04/11 17:09:10 Adds ARM's modf.c Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/modf.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 11 17:10:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B89F106570C; Fri, 11 Apr 2008 17:10:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1EEA61065673 for ; Fri, 11 Apr 2008 17:10:09 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEB328FC1B for ; Fri, 11 Apr 2008 17:10:08 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BHA8HB054653 for ; Fri, 11 Apr 2008 17:10:08 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BHA8wp054651 for perforce@freebsd.org; Fri, 11 Apr 2008 17:10:08 GMT (envelope-from rrs@cisco.com) Date: Fri, 11 Apr 2008 17:10:08 GMT Message-Id: <200804111710.m3BHA8wp054651@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 139824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 17:10:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=139824 Change 139824 by rrs@rrs-mips2-jnpr on 2008/04/11 17:09:28 Adds ARM's fabs.c Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fabs.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 11 17:11:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E68B1065673; Fri, 11 Apr 2008 17:11:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50E14106566B for ; Fri, 11 Apr 2008 17:11:10 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1CB2B8FC15 for ; Fri, 11 Apr 2008 17:11:10 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BHBAPf054736 for ; Fri, 11 Apr 2008 17:11:10 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BHB96R054734 for perforce@freebsd.org; Fri, 11 Apr 2008 17:11:09 GMT (envelope-from rrs@cisco.com) Date: Fri, 11 Apr 2008 17:11:09 GMT Message-Id: <200804111711.m3BHB96R054734@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 139825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 17:11:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=139825 Change 139825 by rrs@rrs-mips2-jnpr on 2008/04/11 17:10:10 Adds arm ieee.h Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/ieee.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 11 17:12:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9ECAD106566C; Fri, 11 Apr 2008 17:12:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 614BC106564A for ; Fri, 11 Apr 2008 17:12:11 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 462A18FC1A for ; Fri, 11 Apr 2008 17:12:11 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BHCBwP054766 for ; Fri, 11 Apr 2008 17:12:11 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BHCBlp054764 for perforce@freebsd.org; Fri, 11 Apr 2008 17:12:11 GMT (envelope-from rrs@cisco.com) Date: Fri, 11 Apr 2008 17:12:11 GMT Message-Id: <200804111712.m3BHCBlp054764@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 139826 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 17:12:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=139826 Change 139826 by rrs@rrs-mips2-jnpr on 2008/04/11 17:11:17 Another hook for Cavium Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/support.S#10 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/support.S#10 (text+ko) ==== @@ -1487,6 +1487,24 @@ #ifdef TARGET_OCTEON +/* + * void octeon_enable_shadow(void) + * turns on access to CC and CCRes + */ +LEAF(octeon_enable_shadow) + li t1, 0x0000000f + mtc0 t1, COP_0_INFO + jr ra + nop +END(octeon_enable_shadow) + + +LEAF(octeon_get_shadow) + mfc0 v0, COP_0_INFO + jr ra + nop +END(octeon_get_shadow) + /* * octeon_set_control(addr, uint32_t val) */ From owner-p4-projects@FreeBSD.ORG Fri Apr 11 17:13:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF5E11065678; Fri, 11 Apr 2008 17:13:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 919EA1065670 for ; Fri, 11 Apr 2008 17:13:12 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 763228FC1C for ; Fri, 11 Apr 2008 17:13:12 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BHDCP1054880 for ; Fri, 11 Apr 2008 17:13:12 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BHDCVE054878 for perforce@freebsd.org; Fri, 11 Apr 2008 17:13:12 GMT (envelope-from rrs@cisco.com) Date: Fri, 11 Apr 2008 17:13:12 GMT Message-Id: <200804111713.m3BHDCVE054878@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 139827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 17:13:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=139827 Change 139827 by rrs@rrs-mips2-jnpr on 2008/04/11 17:13:06 Uses hook provided by support.s Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#22 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#22 (text+ko) ==== @@ -1328,11 +1328,15 @@ } +extern void octeon_enable_shadow(void); +extern uint32_t octeon_get_shadow(void); + void platform_start(__register_t a0 __unused, __register_t a1 __unused, __register_t a2 __unused, __register_t a3 __unused) { vm_offset_t kernend; + uint32_t cnt; uint64_t platform_counter_freq; /* uint64_t oldval, newval;*/ /* uint32_t val;*/ @@ -1373,6 +1377,16 @@ mips_init(); platform_counter_freq = (uint64_t) (octeon_get_clock_rate()); mips_timer_init_params(platform_counter_freq, 0); + + cnt = mips_rd_count(); + printf("Doing mips rd cnt:%x\n", cnt); + cnt = octeon_get_shadow(); + printf("Shadow was %x\n", cnt); + octeon_enable_shadow(); + cnt = octeon_get_shadow(); + printf("Shadow enabled not set to %x\n", cnt); + cnt = mips_rd_count(); + printf("new cnt %x\n", cnt); } From owner-p4-projects@FreeBSD.ORG Fri Apr 11 17:14:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3750E1065675; Fri, 11 Apr 2008 17:14:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9A3C1065673 for ; Fri, 11 Apr 2008 17:14:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B4C2D8FC0A for ; Fri, 11 Apr 2008 17:14:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BHEDmO054897 for ; Fri, 11 Apr 2008 17:14:13 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BHEDhd054895 for perforce@freebsd.org; Fri, 11 Apr 2008 17:14:13 GMT (envelope-from rrs@cisco.com) Date: Fri, 11 Apr 2008 17:14:13 GMT Message-Id: <200804111714.m3BHEDhd054895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 139828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 17:14:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=139828 Change 139828 by rrs@rrs-mips2-jnpr on 2008/04/11 17:13:36 Need added make option. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#15 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#15 (text+ko) ==== @@ -25,7 +25,7 @@ # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" - +makeoptions TARGET_BIG_ENDIAN=defined options KERNVIRTADDR=0x80100000 include "../mips32/octeon32/std.octeon32" @@ -43,13 +43,13 @@ options SCHED_4BSD #4BSD scheduler options INET #InterNETworking -#options NFSCLIENT #Network Filesystem Client -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFSCLIENT #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCLIENT options PSEUDOFS #Pseudo-filesystem framework options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options FFS #Berkeley Fast Filesystem -options BOOTP +#options BOOTP options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories @@ -57,8 +57,8 @@ # Debugging for use in -current #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS #Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +#options WITNESS #Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed options WITNESS_KDB # break to debugger on witness warnings device genclock @@ -69,6 +69,8 @@ device uart device rgmii device octeon_cf +device pty +device random #options VERBOSE_SYSINIT #options SMP @@ -84,3 +86,6 @@ #options ROOTDEVNAME = \"ufs:md0\" #options MD_ROOT_SIZE = 25200 #options TARGET_EMULATOR +options INET6 #IPv6 communications protocols +options SCTP #SCTP + From owner-p4-projects@FreeBSD.ORG Fri Apr 11 17:15:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9ECCD1065672; Fri, 11 Apr 2008 17:15:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 611241065670 for ; Fri, 11 Apr 2008 17:15:15 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2C60B8FC12 for ; Fri, 11 Apr 2008 17:15:15 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BHFFPK054981 for ; Fri, 11 Apr 2008 17:15:15 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BHFFYs054979 for perforce@freebsd.org; Fri, 11 Apr 2008 17:15:15 GMT (envelope-from rrs@cisco.com) Date: Fri, 11 Apr 2008 17:15:15 GMT Message-Id: <200804111715.m3BHFFYs054979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 139829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 17:15:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=139829 Change 139829 by rrs@rrs-mips2-jnpr on 2008/04/11 17:14:27 Use new routines Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/Makefile.inc#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $NetBSD: Makefile.inc,v 1.27 2005/10/07 17:16:40 tsutsui Exp $ -SRCS+= infinity.c fabs.S ldexp.S modf.S +SRCS+= infinity.c fabs.c ldexp.c modf.c # SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \ # fpsetround.c fpsetsticky.c From owner-p4-projects@FreeBSD.ORG Fri Apr 11 20:01:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 165BC1065674; Fri, 11 Apr 2008 20:01:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD0A51065671 for ; Fri, 11 Apr 2008 20:01:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B49E48FC18 for ; Fri, 11 Apr 2008 20:01:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BK1F6k063175 for ; Fri, 11 Apr 2008 20:01:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BK1F96063173 for perforce@freebsd.org; Fri, 11 Apr 2008 20:01:15 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 11 Apr 2008 20:01:15 GMT Message-Id: <200804112001.m3BK1F96063173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 139836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 20:01:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=139836 Change 139836 by hselasky@hselasky_laptop001 on 2008/04/11 20:00:50 Bugfix: We need to lock the global USB mutex when setting the configuration and alternate setting until further. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ugen.c#40 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#40 (text+ko) ==== @@ -1719,7 +1719,9 @@ error = EPERM; break; } + mtx_lock(&usb_global_lock); error = ugen_set_config(sc, *(int *)addr); + mtx_unlock(&usb_global_lock); if (error) { break; } @@ -1740,7 +1742,9 @@ error = EPERM; break; } + mtx_lock(&usb_global_lock); error = ugen_set_interface(sc, ai->uai_interface_index, ai->uai_alt_no); + mtx_unlock(&usb_global_lock); if (error) { break; } From owner-p4-projects@FreeBSD.ORG Fri Apr 11 22:41:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89F0B1065671; Fri, 11 Apr 2008 22:41:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B3C9106566C for ; Fri, 11 Apr 2008 22:41:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F6348FC14 for ; Fri, 11 Apr 2008 22:41:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BMf7jX086310 for ; Fri, 11 Apr 2008 22:41:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BMf6LJ086304 for perforce@freebsd.org; Fri, 11 Apr 2008 22:41:06 GMT (envelope-from imp@freebsd.org) Date: Fri, 11 Apr 2008 22:41:06 GMT Message-Id: <200804112241.m3BMf6LJ086304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 139843 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 22:41:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=139843 Change 139843 by imp@imp_paco-paco on 2008/04/11 22:40:29 IFC @139840 Affected files ... .. //depot/projects/arm/src/UPDATING#26 integrate .. //depot/projects/arm/src/bin/ls/print.c#4 integrate .. //depot/projects/arm/src/contrib/top/machine.h#5 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#22 integrate .. //depot/projects/arm/src/etc/rc.d/Makefile#15 integrate .. //depot/projects/arm/src/etc/rc.d/ppp#8 integrate .. //depot/projects/arm/src/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/arm/src/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/arm/src/include/string.h#2 integrate .. //depot/projects/arm/src/include/unistd.h#6 integrate .. //depot/projects/arm/src/lib/libc/string/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libc/string/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/string/memchr.3#3 integrate .. //depot/projects/arm/src/lib/libc/string/memrchr.c#1 branch .. //depot/projects/arm/src/lib/libc/sys/Symbol.map#10 integrate .. //depot/projects/arm/src/lib/libstand/nfs.c#2 integrate .. //depot/projects/arm/src/libexec/rtld-elf/mips/reloc.c#1 branch .. //depot/projects/arm/src/libexec/rtld-elf/mips/rtld_machdep.h#1 branch .. //depot/projects/arm/src/libexec/rtld-elf/mips/rtld_start.S#1 branch .. //depot/projects/arm/src/libexec/rtld-elf/rtld.c#10 integrate .. //depot/projects/arm/src/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#29 integrate .. //depot/projects/arm/src/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/fsck.h#3 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/fsck_ffs.8#2 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/fsutil.c#3 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/inode.c#3 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/main.c#7 integrate .. //depot/projects/arm/src/sbin/gpt/gpt.c#4 integrate .. //depot/projects/arm/src/sbin/route/route.c#4 integrate .. //depot/projects/arm/src/share/man/man4/asmc.4#2 integrate .. //depot/projects/arm/src/share/man/man4/bpf.4#4 integrate .. //depot/projects/arm/src/share/man/man4/psm.4#2 integrate .. //depot/projects/arm/src/share/man/man5/rc.conf.5#19 integrate .. //depot/projects/arm/src/share/man/man9/Makefile#20 integrate .. //depot/projects/arm/src/share/man/man9/lock.9#10 integrate .. //depot/projects/arm/src/share/mk/bsd.lib.mk#10 integrate .. //depot/projects/arm/src/share/mk/sys.mk#8 integrate .. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#16 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#42 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux.h#13 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_dummy.c#10 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#22 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#22 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#22 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#20 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#21 integrate .. //depot/projects/arm/src/sys/arm/arm/exception.S#2 integrate .. //depot/projects/arm/src/sys/arm/arm/intr.c#14 integrate .. //depot/projects/arm/src/sys/arm/arm/locore.S#26 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#13 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/ep80219_machdep.c#9 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/files.ep80219#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/files.iq31244#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/iq31244_machdep.c#19 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/files.i81342#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#16 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.avila#10 integrate .. //depot/projects/arm/src/sys/boot/forth/loader.conf#18 integrate .. //depot/projects/arm/src/sys/boot/i386/pxeldr/pxeldr.S#5 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_file.c#17 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#32 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_stats.c#15 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_util.c#7 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_util.h#7 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sysvec.c#6 integrate .. //depot/projects/arm/src/sys/conf/options#58 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdSynch.c#5 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#30 integrate .. //depot/projects/arm/src/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/arm/src/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.c#20 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#19 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-cbus.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#43 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#17 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-disk.h#6 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-dma.c#9 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-isa.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#13 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.c#12 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#27 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-queue.c#18 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#18 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.h#11 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-usb.c#7 integrate .. //depot/projects/arm/src/sys/dev/ata/ata_if.m#4 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cam.c#10 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cd.c#10 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cd.h#6 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-fd.c#9 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-fd.h#6 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-tape.c#7 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-tape.h#5 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/psm.c#10 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#38 integrate .. //depot/projects/arm/src/sys/dev/de/if_de.c#6 integrate .. //depot/projects/arm/src/sys/dev/mii/ip1000phy.c#3 integrate .. //depot/projects/arm/src/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/mii/miidevs#21 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#15 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfereg.h#8 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2661.c#14 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#17 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci_pci.c#13 integrate .. //depot/projects/arm/src/sys/dev/usb/ubsa.c#12 integrate .. //depot/projects/arm/src/sys/dev/usb/uhci_pci.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#45 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_subr.c#12 integrate .. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#16 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#22 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#40 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_util.c#3 integrate .. //depot/projects/arm/src/sys/i386/linux/linux.h#13 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_dummy.c#10 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#25 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#24 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#24 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#16 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#24 integrate .. //depot/projects/arm/src/sys/ia64/ia64/interrupt.c#12 integrate .. //depot/projects/arm/src/sys/ia64/ia64/sscdisk.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_cpuset.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_intr.c#20 integrate .. //depot/projects/arm/src/sys/kern/kern_jail.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_lock.c#16 integrate .. //depot/projects/arm/src/sys/kern/kern_timeout.c#12 integrate .. //depot/projects/arm/src/sys/kern/subr_firmware.c#10 integrate .. //depot/projects/arm/src/sys/kern/subr_taskqueue.c#12 integrate .. //depot/projects/arm/src/sys/kern/vfs_cache.c#15 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#24 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#38 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#36 integrate .. //depot/projects/arm/src/sys/modules/asmc/Makefile#2 integrate .. //depot/projects/arm/src/sys/net/bpf.c#27 integrate .. //depot/projects/arm/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/arm/src/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/arm/src/sys/net/if_loop.c#12 integrate .. //depot/projects/arm/src/sys/netgraph/ng_base.c#20 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#29 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#25 integrate .. //depot/projects/arm/src/sys/netinet/ip_ipsec.c#9 integrate .. //depot/projects/arm/src/sys/netinet/ip_ipsec.h#3 integrate .. //depot/projects/arm/src/sys/netinet/tcp.h#10 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#40 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#25 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#18 integrate .. //depot/projects/arm/src/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/arm/src/sys/pc98/cbus/sc_machdep.h#2 integrate .. //depot/projects/arm/src/sys/pc98/cbus/syscons_cbus.c#6 integrate .. //depot/projects/arm/src/sys/pci/if_rl.c#13 integrate .. //depot/projects/arm/src/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/atomic.h#7 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/intr_machdep.c#13 integrate .. //depot/projects/arm/src/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/include/intr_machdep.h#6 integrate .. //depot/projects/arm/src/sys/sparc64/include/smp.h#6 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/intr_machdep.c#9 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/intr_machdep.c#8 integrate .. //depot/projects/arm/src/sys/sys/_lockmgr.h#1 branch .. //depot/projects/arm/src/sys/sys/_stack.h#1 branch .. //depot/projects/arm/src/sys/sys/ata.h#11 integrate .. //depot/projects/arm/src/sys/sys/cpuset.h#6 integrate .. //depot/projects/arm/src/sys/sys/eventhandler.h#8 integrate .. //depot/projects/arm/src/sys/sys/interrupt.h#8 integrate .. //depot/projects/arm/src/sys/sys/jail.h#5 integrate .. //depot/projects/arm/src/sys/sys/kernel.h#11 integrate .. //depot/projects/arm/src/sys/sys/lockmgr.h#12 integrate .. //depot/projects/arm/src/sys/sys/param.h#44 integrate .. //depot/projects/arm/src/sys/sys/proc.h#37 integrate .. //depot/projects/arm/src/sys/sys/sleepqueue.h#9 integrate .. //depot/projects/arm/src/sys/sys/stack.h#3 integrate .. //depot/projects/arm/src/sys/sys/syscallsubr.h#14 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#25 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#26 integrate .. //depot/projects/arm/src/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_dirhash.c#3 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_gjournal.c#3 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_lookup.c#8 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#37 integrate .. //depot/projects/arm/src/sys/vm/vm_phys.c#5 integrate .. //depot/projects/arm/src/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/arm/src/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/arm/src/tools/tools/README#6 integrate .. //depot/projects/arm/src/usr.bin/cpuset/cpuset.c#3 integrate .. //depot/projects/arm/src/usr.bin/fstat/zfs.c#1 branch .. //depot/projects/arm/src/usr.bin/gprof/gprof.h#3 integrate .. //depot/projects/arm/src/usr.bin/top/machine.c#7 integrate .. //depot/projects/arm/src/usr.bin/vmstat/vmstat.c#7 integrate .. //depot/projects/arm/src/usr.bin/xlint/lint1/param.h#2 integrate .. //depot/projects/arm/src/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/arm/src/usr.sbin/config/main.c#10 integrate .. //depot/projects/arm/src/usr.sbin/fifolog/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/fifolog/Makefile.inc#2 integrate .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_create/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_reader/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_writer/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/fifolog/lib/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/Makefile#4 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/add/perform.c#4 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/delete/perform.c#3 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/lib/lib.h#5 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/lib/match.c#3 integrate .. //depot/projects/arm/src/usr.sbin/rpc.lockd/lockd.c#7 integrate .. //depot/projects/arm/src/usr.sbin/rpc.statd/statd.c#6 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/devices.c#7 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/menus.c#8 integrate Differences ... ==== //depot/projects/arm/src/UPDATING#26 (text+ko) ==== @@ -22,6 +22,13 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080408: + psm(4) has gained write(2) support in native operation level. + Arbitrary commands can be written to /dev/psm%d and status can + be read back from it. Therefore, an application is responsible + for status validation and error recovery. It is a no-op in + other operation levels. + 20080312: Support for KSE threading has been removed from the kernel. To run legacy applications linked against KSE libmap.conf may @@ -1007,4 +1014,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ +$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $ ==== //depot/projects/arm/src/bin/ls/print.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.77 2008/04/04 03:57:46 grog Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $"); #include #include @@ -168,7 +168,7 @@ prevdev = sp->st_dev; } np = p->fts_pointer; - (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, + (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, sp->st_nlink, dp->s_user, np->user, dp->s_group, np->group); if (f_flags) @@ -388,7 +388,7 @@ format = d_first ? "%e %b %R" : "%b %e %R"; else /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y" : "%b %e %Y"; + format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); fputc(' ', stdout); ==== //depot/projects/arm/src/contrib/top/machine.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.11 2008/04/11 11:39:26 ru Exp $ */ /* @@ -44,7 +44,6 @@ int *memory; int *swap; struct timeval boottime; - unsigned long cpumask; /* bitfield of cpu states represented */ int ncpus; }; ==== //depot/projects/arm/src/etc/defaults/rc.conf#22 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -105,6 +105,10 @@ #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. +wpa_supplicant_program="/usr/sbin/wpa_supplicant" +wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant +wpa_supplicant_conf_file="/etc/wpa_supplicant.conf" +# firewall_enable="NO" # Set to YES to enable firewall functionality firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) @@ -379,6 +383,19 @@ bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file +rfcomm_pppd_server_enable="NO" # Enable rfcomm_pppd(8) in server mode (or NO) +rfcomm_pppd_server_profile="one two" # Profile to use from /etc/ppp/ppp.conf +# +#rfcomm_pppd_server_one_bdaddr="" # Override local bdaddr for 'one' +rfcomm_pppd_server_one_channel="1" # Override local channel for 'one' +#rfcomm_pppd_server_one_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_one_register_dun="NO" # for 'one' +# +#rfcomm_pppd_server_two_bdaddr="" # Override local bdaddr for 'two' +rfcomm_pppd_server_two_channel="3" # Override local channel for 'two' +#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_two_register_dun="NO" # for 'two' + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ==== //depot/projects/arm/src/etc/rc.d/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.90 2008/04/08 23:34:12 emax Exp $ .include @@ -29,7 +29,7 @@ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - random rarpd resolv root \ + random rarpd resolv rfcomm_pppd_server root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ serial sppp statd swap1 \ ==== //depot/projects/arm/src/etc/rc.d/ppp#8 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.18 2008/03/28 07:57:51 brooks Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.20 2008/04/10 01:32:49 brooks Exp $ # # PROVIDE: ppp @@ -19,6 +19,7 @@ ppp_start_profile() { local _ppp_profile _ppp_mode _ppp_nat _ppp_unit + local _ppp_profile_cleaned _punct _punct_c _ppp_profile=$1 _ppp_profile_cleaned=$1 @@ -61,7 +62,7 @@ # Check for hard wired unit eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit - if [ -n "_ppp_unit" ]; then + if [ -n "${_ppp_unit}" ]; then _ppp_unit="-unit${_ppp_unit}" fi rc_flags="$rc_flags $_ppp_unit" ==== //depot/projects/arm/src/etc/rc.d/wpa_supplicant#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.2 2005/10/19 22:26:47 jkim Exp $ +# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $ # # PROVIDE: wpa_supplicant @@ -12,27 +12,43 @@ name="wpa_supplicant" rcvar= -command="/usr/sbin/${name}" -conf_file="/etc/wpa_supplicant.conf" ifn="$2" if [ -z "$ifn" ]; then return 1 fi +is_wired_interface() +{ + media=`ifconfig $1 2>/dev/null | while read line; do + case "$line" in + *media:?Ethernet*) + echo Ethernet + ;; + esac + done` + test "$media" = "Ethernet" +} + case ${ifn} in ndis*) driver="ndis" ;; *) - driver="bsd" + if is_wired_interface ${ifn} ; then + driver="wired" + else + driver="bsd" + fi ;; esac load_rc_config $name -pid_file="/var/run/${name}/${ifn}.pid" -command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file" +command=${wpa_supplicant_program} +conf_file=${wpa_supplicant_conf_file} +pidfile="/var/run/${name}/${ifn}.pid" +command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file run_rc_command "$1" ==== //depot/projects/arm/src/include/string.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.25 2005/11/24 08:30:44 ru Exp $ + * $FreeBSD: src/include/string.h,v 1.26 2008/04/10 00:12:43 delphij Exp $ */ #ifndef _STRING_H_ @@ -59,6 +59,7 @@ void *memccpy(void * __restrict, const void * __restrict, int, size_t); #endif void *memchr(const void *, int, size_t) __pure; +void *memrchr(const void *, int, size_t) __pure; int memcmp(const void *, const void *, size_t) __pure; void *memcpy(void * __restrict, const void * __restrict, size_t); #if __BSD_VISIBLE ==== //depot/projects/arm/src/include/unistd.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.86 2008/04/01 10:49:06 kib Exp $ + * $FreeBSD: src/include/unistd.h,v 1.87 2008/04/10 12:13:56 kib Exp $ */ #ifndef _UNISTD_H_ @@ -566,7 +566,7 @@ int fchownat(int, const char *, uid_t, gid_t, int); int fexecve(int, char *const [], char *const []); int linkat(int, const char *, int, const char *, int); -ssize_t readlinkat(int, const char *, char *, size_t); +ssize_t readlinkat(int, const char * __restrict, char * __restrict, size_t); int symlinkat(const char *, int, const char *); int unlinkat(int, const char *, int); #endif /* __BSD_VISIBLE */ ==== //depot/projects/arm/src/lib/libc/string/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.37 2006/03/13 01:15:00 deischen Exp $ +# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.38 2008/04/10 00:12:44 delphij Exp $ .PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string @@ -7,7 +7,7 @@ # machine-independent string sources MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c fls.c flsl.c index.c memccpy.c \ - memchr.c memcmp.c \ + memchr.c memrchr.c memcmp.c \ memcpy.c memmem.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c \ strcat.c strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c \ strerror.c strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c \ @@ -39,6 +39,7 @@ MLINKS+=ffs.3 fls.3 MLINKS+=ffs.3 flsl.3 MLINKS+=index.3 rindex.3 +MLINKS+=memchr.3 memrchr.3 MLINKS+=strcasecmp.3 strncasecmp.3 MLINKS+=strcat.3 strncat.3 MLINKS+=strchr.3 strrchr.3 ==== //depot/projects/arm/src/lib/libc/string/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.2 2007/04/29 14:05:19 deischen Exp $ + * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.3 2008/04/10 00:12:44 delphij Exp $ */ FBSD_1.0 { @@ -77,6 +77,10 @@ wmemset; }; +FBSD_1.1 { + memrchr; +}; + FBSDprivate_1.0 { __strtok_r; }; ==== //depot/projects/arm/src/lib/libc/string/memchr.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)memchr.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.9 2007/01/09 00:28:12 imp Exp $ +.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.10 2008/04/10 00:12:44 delphij Exp $ .\" -.Dd June 4, 1993 +.Dd April 9, 2008 .Dt MEMCHR 3 .Os .Sh NAME @@ -44,6 +44,8 @@ .In string.h .Ft void * .Fn memchr "const void *b" "int c" "size_t len" +.Ft void * +.Fn memrchr "const void *b" "int c" "size_t len" .Sh DESCRIPTION The .Fn memchr @@ -53,11 +55,22 @@ (converted to an unsigned char) in string .Fa b . +.Pp +The +.Fn memrchr +function behaves like +.Fn memchr , +except that it locates the last occurrence of +.Fa c +in string +.Fa b . .Sh RETURN VALUES The .Fn memchr -function -returns a pointer to the byte located, +and +.Fn memrchr +functions +return a pointer to the byte located, or NULL if no such byte exists within .Fa len bytes. @@ -77,3 +90,15 @@ function conforms to .St -isoC . +.Pp +The +.Fn memrchr +function is a GNU extension and conforms to no standard. +.Sh HISTORY +The +.Fn memrchr +function first appeared in GNU libc 2.1.91, this implementation +first appeared in +.Fx 8.0 , +coming from +.Ox 4.3 . ==== //depot/projects/arm/src/lib/libc/sys/Symbol.map#10 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.13 2008/03/31 12:14:04 kib Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.14 2008/04/07 13:53:51 deischen Exp $ */ /* @@ -66,11 +66,6 @@ clock_settime; close; connect; - cpuset; - cpuset_getid; - cpuset_setid; - cpuset_getaffinity; - cpuset_setaffinity; dup; dup2; eaccess; @@ -335,6 +330,11 @@ }; FBSD_1.1 { + cpuset; + cpuset_getid; + cpuset_setid; + cpuset_getaffinity; + cpuset_setaffinity; faccessat; fchmodat; fchownat; ==== //depot/projects/arm/src/lib/libstand/nfs.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.12 2004/01/21 20:12:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.13 2008/04/05 15:03:29 dfr Exp $"); #include #include @@ -412,9 +412,16 @@ return (ENXIO); } + /* + * This is silly - we should look at dv_type but that value is + * arch dependant and we can't use it here. + */ #ifndef __i386__ if (strcmp(f->f_dev->dv_name, "net") != 0) return(EINVAL); +#else + if (strcmp(f->f_dev->dv_name, "pxe") != 0) + return(EINVAL); #endif if (!(desc = socktodesc(*(int *)(f->f_devdata)))) ==== //depot/projects/arm/src/libexec/rtld-elf/rtld.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.124 2007/05/17 18:00:27 csjp Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.125 2008/04/04 20:59:26 imp Exp $ */ /* @@ -773,12 +773,19 @@ obj->fini = (Elf_Addr) (obj->relocbase + dynp->d_un.d_ptr); break; + /* + * Don't process DT_DEBUG on MIPS as the dynamic section + * is mapped read-only. DT_MIPS_RLD_MAP is used instead. + */ + +#ifndef __mips__ case DT_DEBUG: /* XXX - not implemented yet */ if (!early) dbg("Filling in DT_DEBUG entry"); ((Elf_Dyn*)dynp)->d_un.d_ptr = (Elf_Addr) &r_debug; break; +#endif case DT_FLAGS: if (dynp->d_un.d_val & DF_ORIGIN) { @@ -795,6 +802,27 @@ if (dynp->d_un.d_val & DF_STATIC_TLS) ; break; +#ifdef __mips__ + case DT_MIPS_LOCAL_GOTNO: + obj->local_gotno = dynp->d_un.d_val; + break; + + case DT_MIPS_SYMTABNO: + obj->symtabno = dynp->d_un.d_val; + break; + + case DT_MIPS_GOTSYM: + obj->gotsym = dynp->d_un.d_val; + break; + + case DT_MIPS_RLD_MAP: +#ifdef notyet + if (!early) + dbg("Filling in DT_DEBUG entry"); + ((Elf_Dyn*)dynp)->d_un.d_ptr = (Elf_Addr) &r_debug; +#endif + break; +#endif default: if (!early) { @@ -1165,7 +1193,10 @@ objtmp.dynamic = rtld_dynamic(&objtmp); digest_dynamic(&objtmp, 1); assert(objtmp.needed == NULL); +#if !defined(__mips__) + /* MIPS and SH{3,5} have a bogus DT_TEXTREL. */ assert(!objtmp.textrel); +#endif /* * Temporarily put the dynamic linker entry into the object list, so @@ -2569,11 +2600,14 @@ continue; /* fallthrough */ case STT_TLS: - if (symp->st_shndx != SHN_UNDEF || - ((flags & SYMLOOK_IN_PLT) == 0 && - ELF_ST_TYPE(symp->st_info) == STT_FUNC)) + if (symp->st_shndx != SHN_UNDEF) + break; +#ifndef __mips__ + else if (((flags & SYMLOOK_IN_PLT) == 0) && + (ELF_ST_TYPE(symp->st_info) == STT_FUNC)) break; /* fallthrough */ +#endif default: continue; } @@ -2937,7 +2971,7 @@ #endif #if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \ - defined(__arm__) + defined(__arm__) || defined(__mips__) /* * Allocate Static TLS using the Variant II method. @@ -3103,7 +3137,7 @@ free_tls_offset(Obj_Entry *obj) { #if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \ - defined(__arm__) + defined(__arm__) || defined(__mips__) /* * If we were the last thing to allocate out of the static TLS * block, we give our space back to the 'allocator'. This is a ==== //depot/projects/arm/src/libexec/rtld-elf/rtld.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.38 2007/04/03 18:31:20 kan Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.39 2008/04/04 20:59:26 imp Exp $ */ #ifndef RTLD_H /* { */ @@ -178,6 +178,11 @@ const Elf_Sym *symtab; /* Symbol table */ const char *strtab; /* String table */ unsigned long strsize; /* Size in bytes of string table */ +#ifdef __mips__ + Elf_Word local_gotno; /* Number of local GOT entries */ + Elf_Word symtabno; /* Number of dynamic symbols */ + Elf_Word gotsym; /* First dynamic symbol in GOT */ +#endif const Elf_Verneed *verneed; /* Required versions. */ Elf_Word verneednum; /* Number of entries in verneed table */ ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#29 (text+ko) ==== @@ -20,7 +20,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1083 2008/03/31 05:06:00 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1084 2008/04/05 18:11:39 bmah Exp $ 2000 @@ -165,7 +165,7 @@ kernel bug reports that are rich in debugging information, but are not dependent on kernel symbol tables or precisely synchronized source code. More information can be found in the - &man.textdump.4; manual page. + &man.textdump.4; manual page. &merged; Kernel support for M:N threading has been removed. While the KSE (Kernel Scheduled Entities) project was quite successful @@ -184,6 +184,10 @@ [&arch.amd64;] The &os; kernel now has support for large memory page mappings (superpages). + [&arch.amd64;, &arch.i386;, &arch.powerpc;] The ULE + scheduler is now the default process scheduler + in GENERIC kernels. &merged; + Boot Loader Changes @@ -205,11 +209,11 @@ Hardware Support The &man.cmx.4; driver, a driver for Omnikey CardMan 4040 - PCMCIA smartcard readers, has been added. + PCMCIA smartcard readers, has been added. &merged; The &man.uslcom.4; driver, a driver for Silicon Laboratories CP2101/CP2102-based USB serial adapters, has been - imported from OpenBSD. + imported from OpenBSD. &merged; Multimedia Support @@ -271,6 +275,9 @@ Disks and Storage + The &man.aac.4; driver now supports volumes larger than + 2TB in size. &merged; + The &man.ata.4; driver now supports a spindown command for disks; after a configurable amount of time, if no requests have been received for a disk, the disk will be spun down @@ -289,12 +296,21 @@ A problem with using &man.mmap.2; on ZFS filesystems has been fixed. + A new kernel-mode NFS lock manager has been added, + improving performance and behavior of NFS locking. A new + &man.clear.locks.8; command has been added to clear locks held + on behalf of an NFS client. + Userland Changes + The &man.adduser.8; utility now supports + a option to set the mode of a new user's + home directory. &merged; + BSD-licensed versions of &man.ar.1; and &man.ranlib.1;, based on libarchive, have replaced the GNU Binutils versions of these utilities. @@ -316,6 +332,13 @@ command to make it easier to debug crash dumps with kernel modules. + The &man.ls.1; program now supports a + option to specify a date format string to be used with the long + format () output. + + &man.nc.1; now supports a switch to + disable the use of TCP options. + The &man.procstat.1; utility has been added to display detailed information about processes. @@ -395,7 +418,11 @@ Ports/Packages Collection Infrastructure - + The pkg_sign and pkg_check utilities for cryptographically + signing &os; packages have been removed. They were only useful + for packages compressed using &man.gzip.1;; however + &man.bzip2.1; compression has been the norm for some time + now. ==== //depot/projects/arm/src/release/ia64/mkisoimages.sh#2 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.11 2005/01/30 21:10:52 kensmith Exp $ +# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.12 2008/04/08 02:57:59 marcel Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -67,7 +67,7 @@ # To create a bootable CD under EFI, the boot image should be an EFI # system partition. if [ $bootable = yes ]; then - EFISZ=32768 + EFISZ=40960 MNT=/mnt dd if=/dev/zero of=$BASE/$EFIPART count=$EFISZ md=`mdconfig -a -t vnode -f $BASE/$EFIPART` ==== //depot/projects/arm/src/sbin/fsck_ffs/fsck.h#3 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. * * @(#)fsck.h 8.4 (Berkeley) 5/9/95 - * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.37 2006/10/31 22:06:56 pjd Exp $ + * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.38 2008/04/10 23:49:23 delphij Exp $ */ #include @@ -270,6 +270,7 @@ int bkgrdflag; /* use a snapshot to run on an active system */ int bflag; /* location of alternate super block */ int debug; /* output debugging info */ +char catastrophicflag; /* run in catastrophic mode */ int cvtlevel; /* convert to newer file system format */ int bkgrdcheck; /* determine if background check is possible */ int bkgrdsumadj; /* whether the kernel have ability to adjust superblock summary */ @@ -335,6 +336,7 @@ void catch(int); void catchquit(int); int changeino(ino_t dir, const char *name, ino_t newnum); +void check_cgmagic(int cg, struct cg *cgp); int chkrange(ufs2_daddr_t blk, int cnt); void ckfini(int markclean); int ckinode(union dinode *dp, struct inodesc *); ==== //depot/projects/arm/src/sbin/fsck_ffs/fsck_ffs.8#2 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)fsck.8 8.4 (Berkeley) 5/9/95 -.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34 2005/09/20 08:02:38 delphij Exp $ +.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.35 2008/04/10 23:49:23 delphij Exp $ .\" -.Dd April 24, 2001 +.Dd April 10, 2008 .Dt FSCK_FFS 8 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd file system consistency check and interactive repair .Sh SYNOPSIS .Nm -.Op Fl BFpfny +.Op Fl BCFpfny .Op Fl b Ar block .Op Fl c Ar level .Op Fl m Ar mode @@ -175,6 +175,26 @@ the super block for the file system. An alternate super block is usually located at block 32 for UFS1, and block 160 for UFS2. +.It Fl C +Run +.Nm +in 'catastrophic recovery' mode, which will enable certain aggressive +operations that can make +.Nm +to survive with file systems that has very serious data damage, which +is an useful last resort when on disk data damage is very serious +and causes +.Nm +to crash otherwise. Be +.Em very careful +using this flag, is dangerous if there are data transmission hazards +because a false positive cylinder group magic number mismatch could +cause +.Em irrevertible data loss! +.Pp +This option implies the +.Fl f +flag. .It Fl c Convert the file system to the specified level. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 11 22:48:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5190A1065671; Fri, 11 Apr 2008 22:48:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE8CB106564A for ; Fri, 11 Apr 2008 22:48:15 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E3C018FC18 for ; Fri, 11 Apr 2008 22:48:15 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BMmFKx086614 for ; Fri, 11 Apr 2008 22:48:15 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BMmEN8086612 for perforce@freebsd.org; Fri, 11 Apr 2008 22:48:14 GMT (envelope-from imp@freebsd.org) Date: Fri, 11 Apr 2008 22:48:14 GMT Message-Id: <200804112248.m3BMmEN8086612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 139844 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 22:48:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=139844 Change 139844 by imp@imp_paco-paco on 2008/04/11 22:47:18 IFC @139840 Affected files ... .. //depot/projects/mips2/src/UPDATING#13 integrate .. //depot/projects/mips2/src/bin/ls/print.c#4 integrate .. //depot/projects/mips2/src/contrib/top/machine.h#5 integrate .. //depot/projects/mips2/src/etc/defaults/rc.conf#9 integrate .. //depot/projects/mips2/src/etc/rc.d/Makefile#8 integrate .. //depot/projects/mips2/src/etc/rc.d/ppp#6 integrate .. //depot/projects/mips2/src/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/mips2/src/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/mips2/src/include/string.h#2 integrate .. //depot/projects/mips2/src/include/unistd.h#6 integrate .. //depot/projects/mips2/src/lib/libc/string/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libc/string/Symbol.map#3 integrate .. //depot/projects/mips2/src/lib/libc/string/memchr.3#3 integrate .. //depot/projects/mips2/src/lib/libc/string/memrchr.c#1 branch .. //depot/projects/mips2/src/lib/libc/sys/Symbol.map#10 integrate .. //depot/projects/mips2/src/lib/libstand/nfs.c#2 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/rtld.h#4 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#16 integrate .. //depot/projects/mips2/src/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/fsck.h#3 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/fsck_ffs.8#2 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/fsutil.c#3 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/inode.c#3 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/main.c#7 integrate .. //depot/projects/mips2/src/sbin/gpt/gpt.c#5 integrate .. //depot/projects/mips2/src/sbin/route/route.c#4 integrate .. //depot/projects/mips2/src/share/man/man4/asmc.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/bpf.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/psm.4#2 integrate .. //depot/projects/mips2/src/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/mips2/src/share/man/man9/Makefile#13 integrate .. //depot/projects/mips2/src/share/man/man9/lock.9#9 integrate .. //depot/projects/mips2/src/share/mk/bsd.lib.mk#6 integrate .. //depot/projects/mips2/src/share/mk/sys.mk#13 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/mips2/src/sys/arm/arm/exception.S#2 integrate .. //depot/projects/mips2/src/sys/arm/arm/intr.c#6 integrate .. //depot/projects/mips2/src/sys/arm/arm/locore.S#5 integrate .. //depot/projects/mips2/src/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/files.ep80219#3 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/files.iq31244#3 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/mips2/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/arm/xscale/ixp425/files.avila#3 integrate .. //depot/projects/mips2/src/sys/boot/forth/loader.conf#8 integrate .. //depot/projects/mips2/src/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_file.c#9 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/mips2/src/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_util.h#3 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_sysvec.c#5 integrate .. //depot/projects/mips2/src/sys/conf/options#17 integrate .. //depot/projects/mips2/src/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/mips2/src/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/mips2/src/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/mips2/src/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/mips2/src/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-all.h#9 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-disk.h#4 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-dma.c#6 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-lowlevel.c#6 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-pci.h#9 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-usb.c#4 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata_if.m#3 integrate .. //depot/projects/mips2/src/sys/dev/ata/atapi-cam.c#5 integrate .. //depot/projects/mips2/src/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/mips2/src/sys/dev/ata/atapi-cd.h#4 integrate .. //depot/projects/mips2/src/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/mips2/src/sys/dev/ata/atapi-fd.h#3 integrate .. //depot/projects/mips2/src/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/mips2/src/sys/dev/ata/atapi-tape.h#3 integrate .. //depot/projects/mips2/src/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/mips2/src/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/mips2/src/sys/dev/de/if_de.c#4 integrate .. //depot/projects/mips2/src/sys/dev/mii/ip1000phy.c#3 integrate .. //depot/projects/mips2/src/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/mips2/src/sys/dev/mii/miidevs#9 integrate .. //depot/projects/mips2/src/sys/dev/nfe/if_nfe.c#10 integrate .. //depot/projects/mips2/src/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/mips2/src/sys/dev/ral/rt2661.c#7 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/mips2/src/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/mips2/src/sys/dev/usb/ubsa.c#6 integrate .. //depot/projects/mips2/src/sys/dev/usb/uhci_pci.c#5 integrate .. //depot/projects/mips2/src/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/mips2/src/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/mips2/src/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/mips2/src/sys/i386/i386/mp_machdep.c#9 integrate .. //depot/projects/mips2/src/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_util.c#3 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux.h#4 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_dummy.c#3 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_proto.h#6 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_syscall.h#6 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_sysent.c#6 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_sysvec.c#7 integrate .. //depot/projects/mips2/src/sys/i386/linux/syscalls.master#6 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/interrupt.c#7 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/mips2/src/sys/kern/kern_cpuset.c#6 integrate .. //depot/projects/mips2/src/sys/kern/kern_intr.c#10 integrate .. //depot/projects/mips2/src/sys/kern/kern_jail.c#7 integrate .. //depot/projects/mips2/src/sys/kern/kern_lock.c#11 integrate .. //depot/projects/mips2/src/sys/kern/kern_timeout.c#11 integrate .. //depot/projects/mips2/src/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/mips2/src/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/mips2/src/sys/kern/vfs_cache.c#11 integrate .. //depot/projects/mips2/src/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/mips2/src/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/mips2/src/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/mips2/src/sys/modules/asmc/Makefile#2 integrate .. //depot/projects/mips2/src/sys/net/bpf.c#12 integrate .. //depot/projects/mips2/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/mips2/src/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/mips2/src/sys/net/if_loop.c#6 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_base.c#14 integrate .. //depot/projects/mips2/src/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/mips2/src/sys/netinet/ip_input.c#7 integrate .. //depot/projects/mips2/src/sys/netinet/ip_ipsec.c#7 integrate .. //depot/projects/mips2/src/sys/netinet/ip_ipsec.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/tcp.h#6 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_pcb.c#8 integrate .. //depot/projects/mips2/src/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/mips2/src/sys/pc98/cbus/sc_machdep.h#2 integrate .. //depot/projects/mips2/src/sys/pc98/cbus/syscons_cbus.c#5 integrate .. //depot/projects/mips2/src/sys/pci/if_rl.c#7 integrate .. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/include/atomic.h#6 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/intr_machdep.c#11 integrate .. //depot/projects/mips2/src/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/mips2/src/sys/sparc64/include/intr_machdep.h#4 integrate .. //depot/projects/mips2/src/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/intr_machdep.c#7 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/sun4v/sun4v/intr_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/sys/_lockmgr.h#1 branch .. //depot/projects/mips2/src/sys/sys/_stack.h#1 branch .. //depot/projects/mips2/src/sys/sys/ata.h#7 integrate .. //depot/projects/mips2/src/sys/sys/cpuset.h#6 integrate .. //depot/projects/mips2/src/sys/sys/eventhandler.h#6 integrate .. //depot/projects/mips2/src/sys/sys/interrupt.h#6 integrate .. //depot/projects/mips2/src/sys/sys/jail.h#4 integrate .. //depot/projects/mips2/src/sys/sys/kernel.h#8 integrate .. //depot/projects/mips2/src/sys/sys/lockmgr.h#9 integrate .. //depot/projects/mips2/src/sys/sys/param.h#16 integrate .. //depot/projects/mips2/src/sys/sys/proc.h#16 integrate .. //depot/projects/mips2/src/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/mips2/src/sys/sys/stack.h#3 integrate .. //depot/projects/mips2/src/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/mips2/src/sys/sys/vnode.h#9 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_softdep.c#11 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_gjournal.c#3 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_lookup.c#6 integrate .. //depot/projects/mips2/src/sys/vm/vm_page.c#12 integrate .. //depot/projects/mips2/src/sys/vm/vm_phys.c#4 integrate .. //depot/projects/mips2/src/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/mips2/src/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/mips2/src/tools/tools/README#5 integrate .. //depot/projects/mips2/src/usr.bin/cpuset/cpuset.c#3 integrate .. //depot/projects/mips2/src/usr.bin/fstat/zfs.c#1 branch .. //depot/projects/mips2/src/usr.bin/gprof/gprof.h#4 integrate .. //depot/projects/mips2/src/usr.bin/top/machine.c#7 integrate .. //depot/projects/mips2/src/usr.bin/vmstat/vmstat.c#6 integrate .. //depot/projects/mips2/src/usr.bin/xlint/lint1/param.h#3 integrate .. //depot/projects/mips2/src/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/config/main.c#5 integrate .. //depot/projects/mips2/src/usr.sbin/fifolog/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/fifolog/Makefile.inc#2 integrate .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_create/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_reader/Makefile#3 integrate .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_writer/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/fifolog/lib/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/Makefile#5 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/add/perform.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/delete/perform.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/lib/lib.h#5 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/lib/match.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/rpc.lockd/lockd.c#8 integrate .. //depot/projects/mips2/src/usr.sbin/rpc.statd/statd.c#7 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/devices.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/menus.c#7 integrate Differences ... ==== //depot/projects/mips2/src/UPDATING#13 (text+ko) ==== @@ -22,6 +22,13 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080408: + psm(4) has gained write(2) support in native operation level. + Arbitrary commands can be written to /dev/psm%d and status can + be read back from it. Therefore, an application is responsible + for status validation and error recovery. It is a no-op in + other operation levels. + 20080312: Support for KSE threading has been removed from the kernel. To run legacy applications linked against KSE libmap.conf may @@ -1007,4 +1014,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ +$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $ ==== //depot/projects/mips2/src/bin/ls/print.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.77 2008/04/04 03:57:46 grog Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $"); #include #include @@ -168,7 +168,7 @@ prevdev = sp->st_dev; } np = p->fts_pointer; - (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, + (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, sp->st_nlink, dp->s_user, np->user, dp->s_group, np->group); if (f_flags) @@ -388,7 +388,7 @@ format = d_first ? "%e %b %R" : "%b %e %R"; else /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y" : "%b %e %Y"; + format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); fputc(' ', stdout); ==== //depot/projects/mips2/src/contrib/top/machine.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.11 2008/04/11 11:39:26 ru Exp $ */ /* @@ -44,7 +44,6 @@ int *memory; int *swap; struct timeval boottime; - unsigned long cpumask; /* bitfield of cpu states represented */ int ncpus; }; ==== //depot/projects/mips2/src/etc/defaults/rc.conf#9 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -105,6 +105,10 @@ #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. +wpa_supplicant_program="/usr/sbin/wpa_supplicant" +wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant +wpa_supplicant_conf_file="/etc/wpa_supplicant.conf" +# firewall_enable="NO" # Set to YES to enable firewall functionality firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) @@ -379,6 +383,19 @@ bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file +rfcomm_pppd_server_enable="NO" # Enable rfcomm_pppd(8) in server mode (or NO) +rfcomm_pppd_server_profile="one two" # Profile to use from /etc/ppp/ppp.conf +# +#rfcomm_pppd_server_one_bdaddr="" # Override local bdaddr for 'one' +rfcomm_pppd_server_one_channel="1" # Override local channel for 'one' +#rfcomm_pppd_server_one_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_one_register_dun="NO" # for 'one' +# +#rfcomm_pppd_server_two_bdaddr="" # Override local bdaddr for 'two' +rfcomm_pppd_server_two_channel="3" # Override local channel for 'two' +#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_two_register_dun="NO" # for 'two' + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ==== //depot/projects/mips2/src/etc/rc.d/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.90 2008/04/08 23:34:12 emax Exp $ .include @@ -29,7 +29,7 @@ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - random rarpd resolv root \ + random rarpd resolv rfcomm_pppd_server root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ serial sppp statd swap1 \ ==== //depot/projects/mips2/src/etc/rc.d/ppp#6 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.18 2008/03/28 07:57:51 brooks Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.20 2008/04/10 01:32:49 brooks Exp $ # # PROVIDE: ppp @@ -19,6 +19,7 @@ ppp_start_profile() { local _ppp_profile _ppp_mode _ppp_nat _ppp_unit + local _ppp_profile_cleaned _punct _punct_c _ppp_profile=$1 _ppp_profile_cleaned=$1 @@ -61,7 +62,7 @@ # Check for hard wired unit eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit - if [ -n "_ppp_unit" ]; then + if [ -n "${_ppp_unit}" ]; then _ppp_unit="-unit${_ppp_unit}" fi rc_flags="$rc_flags $_ppp_unit" ==== //depot/projects/mips2/src/etc/rc.d/wpa_supplicant#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.2 2005/10/19 22:26:47 jkim Exp $ +# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $ # # PROVIDE: wpa_supplicant @@ -12,27 +12,43 @@ name="wpa_supplicant" rcvar= -command="/usr/sbin/${name}" -conf_file="/etc/wpa_supplicant.conf" ifn="$2" if [ -z "$ifn" ]; then return 1 fi +is_wired_interface() +{ + media=`ifconfig $1 2>/dev/null | while read line; do + case "$line" in + *media:?Ethernet*) + echo Ethernet + ;; + esac + done` + test "$media" = "Ethernet" +} + case ${ifn} in ndis*) driver="ndis" ;; *) - driver="bsd" + if is_wired_interface ${ifn} ; then + driver="wired" + else + driver="bsd" + fi ;; esac load_rc_config $name -pid_file="/var/run/${name}/${ifn}.pid" -command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file" +command=${wpa_supplicant_program} +conf_file=${wpa_supplicant_conf_file} +pidfile="/var/run/${name}/${ifn}.pid" +command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file run_rc_command "$1" ==== //depot/projects/mips2/src/include/string.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.25 2005/11/24 08:30:44 ru Exp $ + * $FreeBSD: src/include/string.h,v 1.26 2008/04/10 00:12:43 delphij Exp $ */ #ifndef _STRING_H_ @@ -59,6 +59,7 @@ void *memccpy(void * __restrict, const void * __restrict, int, size_t); #endif void *memchr(const void *, int, size_t) __pure; +void *memrchr(const void *, int, size_t) __pure; int memcmp(const void *, const void *, size_t) __pure; void *memcpy(void * __restrict, const void * __restrict, size_t); #if __BSD_VISIBLE ==== //depot/projects/mips2/src/include/unistd.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.86 2008/04/01 10:49:06 kib Exp $ + * $FreeBSD: src/include/unistd.h,v 1.87 2008/04/10 12:13:56 kib Exp $ */ #ifndef _UNISTD_H_ @@ -566,7 +566,7 @@ int fchownat(int, const char *, uid_t, gid_t, int); int fexecve(int, char *const [], char *const []); int linkat(int, const char *, int, const char *, int); -ssize_t readlinkat(int, const char *, char *, size_t); +ssize_t readlinkat(int, const char * __restrict, char * __restrict, size_t); int symlinkat(const char *, int, const char *); int unlinkat(int, const char *, int); #endif /* __BSD_VISIBLE */ ==== //depot/projects/mips2/src/lib/libc/string/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.37 2006/03/13 01:15:00 deischen Exp $ +# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.38 2008/04/10 00:12:44 delphij Exp $ .PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string @@ -7,7 +7,7 @@ # machine-independent string sources MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c fls.c flsl.c index.c memccpy.c \ - memchr.c memcmp.c \ + memchr.c memrchr.c memcmp.c \ memcpy.c memmem.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c \ strcat.c strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c \ strerror.c strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c \ @@ -39,6 +39,7 @@ MLINKS+=ffs.3 fls.3 MLINKS+=ffs.3 flsl.3 MLINKS+=index.3 rindex.3 +MLINKS+=memchr.3 memrchr.3 MLINKS+=strcasecmp.3 strncasecmp.3 MLINKS+=strcat.3 strncat.3 MLINKS+=strchr.3 strrchr.3 ==== //depot/projects/mips2/src/lib/libc/string/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.2 2007/04/29 14:05:19 deischen Exp $ + * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.3 2008/04/10 00:12:44 delphij Exp $ */ FBSD_1.0 { @@ -77,6 +77,10 @@ wmemset; }; +FBSD_1.1 { + memrchr; +}; + FBSDprivate_1.0 { __strtok_r; }; ==== //depot/projects/mips2/src/lib/libc/string/memchr.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)memchr.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.9 2007/01/09 00:28:12 imp Exp $ +.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.10 2008/04/10 00:12:44 delphij Exp $ .\" -.Dd June 4, 1993 +.Dd April 9, 2008 .Dt MEMCHR 3 .Os .Sh NAME @@ -44,6 +44,8 @@ .In string.h .Ft void * .Fn memchr "const void *b" "int c" "size_t len" +.Ft void * +.Fn memrchr "const void *b" "int c" "size_t len" .Sh DESCRIPTION The .Fn memchr @@ -53,11 +55,22 @@ (converted to an unsigned char) in string .Fa b . +.Pp +The +.Fn memrchr +function behaves like +.Fn memchr , +except that it locates the last occurrence of +.Fa c +in string +.Fa b . .Sh RETURN VALUES The .Fn memchr -function -returns a pointer to the byte located, +and +.Fn memrchr +functions +return a pointer to the byte located, or NULL if no such byte exists within .Fa len bytes. @@ -77,3 +90,15 @@ function conforms to .St -isoC . +.Pp +The +.Fn memrchr +function is a GNU extension and conforms to no standard. +.Sh HISTORY +The +.Fn memrchr +function first appeared in GNU libc 2.1.91, this implementation +first appeared in +.Fx 8.0 , +coming from +.Ox 4.3 . ==== //depot/projects/mips2/src/lib/libc/sys/Symbol.map#10 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.13 2008/03/31 12:14:04 kib Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.14 2008/04/07 13:53:51 deischen Exp $ */ /* @@ -66,11 +66,6 @@ clock_settime; close; connect; - cpuset; - cpuset_getid; - cpuset_setid; - cpuset_getaffinity; - cpuset_setaffinity; dup; dup2; eaccess; @@ -335,6 +330,11 @@ }; FBSD_1.1 { + cpuset; + cpuset_getid; + cpuset_setid; + cpuset_getaffinity; + cpuset_setaffinity; faccessat; fchmodat; fchownat; ==== //depot/projects/mips2/src/lib/libstand/nfs.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.12 2004/01/21 20:12:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.13 2008/04/05 15:03:29 dfr Exp $"); #include #include @@ -412,9 +412,16 @@ return (ENXIO); } + /* + * This is silly - we should look at dv_type but that value is + * arch dependant and we can't use it here. + */ #ifndef __i386__ if (strcmp(f->f_dev->dv_name, "net") != 0) return(EINVAL); +#else + if (strcmp(f->f_dev->dv_name, "pxe") != 0) + return(EINVAL); #endif if (!(desc = socktodesc(*(int *)(f->f_devdata)))) ==== //depot/projects/mips2/src/libexec/rtld-elf/rtld.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.124 2007/05/17 18:00:27 csjp Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.125 2008/04/04 20:59:26 imp Exp $ */ /* ==== //depot/projects/mips2/src/libexec/rtld-elf/rtld.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.38 2007/04/03 18:31:20 kan Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.39 2008/04/04 20:59:26 imp Exp $ */ #ifndef RTLD_H /* { */ ==== //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#16 (text+ko) ==== @@ -20,7 +20,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1083 2008/03/31 05:06:00 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1084 2008/04/05 18:11:39 bmah Exp $ 2000 @@ -165,7 +165,7 @@ kernel bug reports that are rich in debugging information, but are not dependent on kernel symbol tables or precisely synchronized source code. More information can be found in the - &man.textdump.4; manual page. + &man.textdump.4; manual page. &merged; Kernel support for M:N threading has been removed. While the KSE (Kernel Scheduled Entities) project was quite successful @@ -184,6 +184,10 @@ [&arch.amd64;] The &os; kernel now has support for large memory page mappings (superpages). + [&arch.amd64;, &arch.i386;, &arch.powerpc;] The ULE + scheduler is now the default process scheduler + in GENERIC kernels. &merged; + Boot Loader Changes @@ -205,11 +209,11 @@ Hardware Support The &man.cmx.4; driver, a driver for Omnikey CardMan 4040 - PCMCIA smartcard readers, has been added. + PCMCIA smartcard readers, has been added. &merged; The &man.uslcom.4; driver, a driver for Silicon Laboratories CP2101/CP2102-based USB serial adapters, has been - imported from OpenBSD. + imported from OpenBSD. &merged; Multimedia Support @@ -271,6 +275,9 @@ Disks and Storage + The &man.aac.4; driver now supports volumes larger than + 2TB in size. &merged; + The &man.ata.4; driver now supports a spindown command for disks; after a configurable amount of time, if no requests have been received for a disk, the disk will be spun down @@ -289,12 +296,21 @@ A problem with using &man.mmap.2; on ZFS filesystems has been fixed. + A new kernel-mode NFS lock manager has been added, + improving performance and behavior of NFS locking. A new + &man.clear.locks.8; command has been added to clear locks held + on behalf of an NFS client. + Userland Changes + The &man.adduser.8; utility now supports + a option to set the mode of a new user's + home directory. &merged; + BSD-licensed versions of &man.ar.1; and &man.ranlib.1;, based on libarchive, have replaced the GNU Binutils versions of these utilities. @@ -316,6 +332,13 @@ command to make it easier to debug crash dumps with kernel modules. + The &man.ls.1; program now supports a + option to specify a date format string to be used with the long + format () output. + + &man.nc.1; now supports a switch to + disable the use of TCP options. + The &man.procstat.1; utility has been added to display detailed information about processes. @@ -395,7 +418,11 @@ Ports/Packages Collection Infrastructure - + The pkg_sign and pkg_check utilities for cryptographically + signing &os; packages have been removed. They were only useful + for packages compressed using &man.gzip.1;; however + &man.bzip2.1; compression has been the norm for some time + now. ==== //depot/projects/mips2/src/release/ia64/mkisoimages.sh#2 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.11 2005/01/30 21:10:52 kensmith Exp $ +# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.12 2008/04/08 02:57:59 marcel Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -67,7 +67,7 @@ # To create a bootable CD under EFI, the boot image should be an EFI # system partition. if [ $bootable = yes ]; then - EFISZ=32768 + EFISZ=40960 MNT=/mnt dd if=/dev/zero of=$BASE/$EFIPART count=$EFISZ md=`mdconfig -a -t vnode -f $BASE/$EFIPART` ==== //depot/projects/mips2/src/sbin/fsck_ffs/fsck.h#3 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. * * @(#)fsck.h 8.4 (Berkeley) 5/9/95 - * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.37 2006/10/31 22:06:56 pjd Exp $ + * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.38 2008/04/10 23:49:23 delphij Exp $ */ #include @@ -270,6 +270,7 @@ int bkgrdflag; /* use a snapshot to run on an active system */ int bflag; /* location of alternate super block */ int debug; /* output debugging info */ +char catastrophicflag; /* run in catastrophic mode */ int cvtlevel; /* convert to newer file system format */ int bkgrdcheck; /* determine if background check is possible */ int bkgrdsumadj; /* whether the kernel have ability to adjust superblock summary */ @@ -335,6 +336,7 @@ void catch(int); void catchquit(int); int changeino(ino_t dir, const char *name, ino_t newnum); +void check_cgmagic(int cg, struct cg *cgp); int chkrange(ufs2_daddr_t blk, int cnt); void ckfini(int markclean); int ckinode(union dinode *dp, struct inodesc *); ==== //depot/projects/mips2/src/sbin/fsck_ffs/fsck_ffs.8#2 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)fsck.8 8.4 (Berkeley) 5/9/95 -.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34 2005/09/20 08:02:38 delphij Exp $ +.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.35 2008/04/10 23:49:23 delphij Exp $ .\" -.Dd April 24, 2001 +.Dd April 10, 2008 .Dt FSCK_FFS 8 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd file system consistency check and interactive repair .Sh SYNOPSIS .Nm -.Op Fl BFpfny +.Op Fl BCFpfny .Op Fl b Ar block .Op Fl c Ar level .Op Fl m Ar mode @@ -175,6 +175,26 @@ the super block for the file system. An alternate super block is usually located at block 32 for UFS1, and block 160 for UFS2. +.It Fl C +Run +.Nm +in 'catastrophic recovery' mode, which will enable certain aggressive +operations that can make +.Nm +to survive with file systems that has very serious data damage, which +is an useful last resort when on disk data damage is very serious +and causes +.Nm +to crash otherwise. Be +.Em very careful +using this flag, is dangerous if there are data transmission hazards +because a false positive cylinder group magic number mismatch could +cause +.Em irrevertible data loss! +.Pp +This option implies the +.Fl f +flag. .It Fl c Convert the file system to the specified level. Note that the level of a file system can only be raised. ==== //depot/projects/mips2/src/sbin/fsck_ffs/fsutil.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.26 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.27 2008/04/10 23:49:23 delphij Exp $"); #include #include @@ -418,6 +418,35 @@ } /* + * Check cg's magic number. If catastrophic mode is enabled and the cg's + * magic number is bad, offer an option to clear the whole cg. + */ +void +check_cgmagic(int cg, struct cg *cgp) +{ + + if (!cg_chkmagic(cgp)) { + pwarn("CG %d: BAD MAGIC NUMBER\n", cg); + if (catastrophicflag) { + if (reply("CLEAR CG")) { + memset(cgp, 0, (size_t)sblock.fs_cgsize); + cgp->cg_initediblk = sblock.fs_ipg; + cgp->cg_old_niblk = sblock.fs_ipg; + cgp->cg_old_ncyl = sblock.fs_old_cpg; + cgp->cg_cgx = cg; + cgp->cg_niblk = sblock.fs_ipg; + cgp->cg_ndblk = sblock.fs_size - cgbase(&sblock, cg); + cgp->cg_magic = CG_MAGIC; + cgdirty(); + printf("PLEASE RERUN FSCK.\n"); + rerun = 1; + } + } else + printf("YOU MAY NEED TO RERUN FSCK WITH -C IF IT CRASHED.\n"); + } +} + +/* * allocate a data block with the specified number of fragments */ ufs2_daddr_t @@ -441,8 +470,7 @@ } cg = dtog(&sblock, i + j); getblk(&cgblk, cgtod(&sblock, cg), sblock.fs_cgsize); - if (!cg_chkmagic(cgp)) - pfatal("CG %d: BAD MAGIC NUMBER\n", cg); + check_cgmagic(cg, cgp); baseblk = dtogd(&sblock, i + j); for (k = 0; k < frags; k++) { setbmap(i + j + k); ==== //depot/projects/mips2/src/sbin/fsck_ffs/inode.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.39 2008/04/10 23:49:23 delphij Exp $"); #include #include @@ -617,8 +617,7 @@ return (0); cg = ino_to_cg(&sblock, ino); getblk(&cgblk, cgtod(&sblock, cg), sblock.fs_cgsize); - if (!cg_chkmagic(cgp)) - pfatal("CG %d: BAD MAGIC NUMBER\n", cg); + check_cgmagic(cg, cgp); setbit(cg_inosused(cgp), ino % sblock.fs_ipg); cgp->cg_cs.cs_nifree--; switch (type & IFMT) { ==== //depot/projects/mips2/src/sbin/fsck_ffs/main.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.50 2008/04/04 01:50:58 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.51 2008/04/10 23:49:23 delphij Exp $"); #include #include @@ -81,7 +81,8 @@ sync(); skipclean = 1; - while ((ch = getopt(argc, argv, "b:Bc:dfFm:npy")) != -1) { + catastrophicflag = 0; + while ((ch = getopt(argc, argv, "b:Bc:CdfFm:npy")) != -1) { switch (ch) { case 'b': skipclean = 0; @@ -105,6 +106,10 @@ debug++; break; + case 'C': + catastrophicflag = 1; + /* FALLTHROUGH */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 11 22:55:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82A021065672; Fri, 11 Apr 2008 22:55:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 446E5106566C for ; Fri, 11 Apr 2008 22:55:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3C2BB8FC13 for ; Fri, 11 Apr 2008 22:55:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BMtN5d087077 for ; Fri, 11 Apr 2008 22:55:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BMtNvr087075 for perforce@freebsd.org; Fri, 11 Apr 2008 22:55:23 GMT (envelope-from sam@freebsd.org) Date: Fri, 11 Apr 2008 22:55:23 GMT Message-Id: <200804112255.m3BMtNvr087075@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 Cc: Subject: PERFORCE change 139845 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 22:55:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=139845 Change 139845 by sam@sam_ebb on 2008/04/11 22:54:35 honor dotd and doth when deciding whether a country ie should be included in beacon and probe response frames; this allows turning off 11h support but still including the country ie Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#47 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#47 (text+ko) ==== @@ -2187,7 +2187,7 @@ *frm++ = 2; *frm++ = 0; *frm++ = 0; /* TODO: ATIM window */ } - if (vap->iv_flags & IEEE80211_F_DOTH) + if (vap->iv_flags & (IEEE80211_F_DOTD|IEEE80211_F_DOTH)) frm = ieee80211_add_countryie(frm, ic); if (vap->iv_flags & IEEE80211_F_WPA2) { if (vap->iv_rsn_ie != NULL) @@ -2470,7 +2470,7 @@ bo->bo_tim_len = 1; } bo->bo_tim_trailer = frm; - if (vap->iv_flags & IEEE80211_F_DOTH) + if (vap->iv_flags & (IEEE80211_F_DOTD|IEEE80211_F_DOTH)) frm = ieee80211_add_countryie(frm, ic); if (vap->iv_flags & IEEE80211_F_WPA2) { if (vap->iv_rsn_ie != NULL) From owner-p4-projects@FreeBSD.ORG Fri Apr 11 22:55:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7ABFB106571B; Fri, 11 Apr 2008 22:55:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BDFD1065716 for ; Fri, 11 Apr 2008 22:55:24 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 311B08FC14 for ; Fri, 11 Apr 2008 22:55:24 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BMtOHv087082 for ; Fri, 11 Apr 2008 22:55:24 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BMtNLS087080 for perforce@freebsd.org; Fri, 11 Apr 2008 22:55:23 GMT (envelope-from imp@freebsd.org) Date: Fri, 11 Apr 2008 22:55:23 GMT Message-Id: <200804112255.m3BMtNLS087080@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 139846 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 22:55:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=139846 Change 139846 by imp@imp_paco-paco on 2008/04/11 22:55:15 IF mips2 @139844 Affected files ... .. //depot/projects/mips2-jnpr/src/UPDATING#5 integrate .. //depot/projects/mips2-jnpr/src/bin/ls/print.c#3 integrate .. //depot/projects/mips2-jnpr/src/contrib/top/machine.h#3 integrate .. //depot/projects/mips2-jnpr/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/ppp#4 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/mips2-jnpr/src/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/mips2-jnpr/src/include/string.h#2 integrate .. //depot/projects/mips2-jnpr/src/include/unistd.h#5 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/string/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/string/Symbol.map#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/string/memchr.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/string/memrchr.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libc/sys/Symbol.map#6 integrate .. //depot/projects/mips2-jnpr/src/lib/libstand/nfs.c#2 integrate .. //depot/projects/mips2-jnpr/src/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/mips2-jnpr/src/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/mips2-jnpr/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/mips2-jnpr/src/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/fsck_ffs.8#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/fsutil.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/inode.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/mips2-jnpr/src/sbin/gpt/gpt.c#3 integrate .. //depot/projects/mips2-jnpr/src/sbin/route/route.c#3 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/asmc.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/bpf.4#3 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/psm.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/Makefile#6 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/lock.9#6 integrate .. //depot/projects/mips2-jnpr/src/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/mips2-jnpr/src/share/mk/sys.mk#4 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/arm/exception.S#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/arm/intr.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/arm/locore.S#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i80321/files.ep80219#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i80321/files.iq31244#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/ixp425/files.avila#3 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/options#8 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/de/if_de.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/mii/miidevs#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/ibcs2/ibcs2_util.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/linux/linux.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_cpuset.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_intr.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_jail.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_lock.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_timeout.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/asmc/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/net/bpf.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/net/if_loop.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/ip_ipsec.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/tcp.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/cbus/sc_machdep.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/cbus/syscons_cbus.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/pci/if_rl.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/atomic.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/powerpc/intr_machdep.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/_lockmgr.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/sys/_stack.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/sys/ata.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/cpuset.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/eventhandler.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/interrupt.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/jail.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/kernel.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/lockmgr.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/param.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/proc.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/stack.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/vnode.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_page.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_phys.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/mips2-jnpr/src/tools/tools/README#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/cpuset/cpuset.c#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/fstat/zfs.c#1 branch .. //depot/projects/mips2-jnpr/src/usr.bin/gprof/gprof.h#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/top/machine.c#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/vmstat/vmstat.c#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/xlint/lint1/param.h#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/config/main.c#3 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_create/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_reader/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_writer/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/lib/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/add/perform.c#3 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/rpc.lockd/lockd.c#4 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/rpc.statd/statd.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/sysinstall/devices.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/sysinstall/menus.c#3 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/UPDATING#5 (text+ko) ==== @@ -22,6 +22,13 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080408: + psm(4) has gained write(2) support in native operation level. + Arbitrary commands can be written to /dev/psm%d and status can + be read back from it. Therefore, an application is responsible + for status validation and error recovery. It is a no-op in + other operation levels. + 20080312: Support for KSE threading has been removed from the kernel. To run legacy applications linked against KSE libmap.conf may @@ -1007,4 +1014,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ +$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $ ==== //depot/projects/mips2-jnpr/src/bin/ls/print.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.77 2008/04/04 03:57:46 grog Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $"); #include #include @@ -168,7 +168,7 @@ prevdev = sp->st_dev; } np = p->fts_pointer; - (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, + (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, sp->st_nlink, dp->s_user, np->user, dp->s_group, np->group); if (f_flags) @@ -388,7 +388,7 @@ format = d_first ? "%e %b %R" : "%b %e %R"; else /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y" : "%b %e %Y"; + format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); fputc(' ', stdout); ==== //depot/projects/mips2-jnpr/src/contrib/top/machine.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.11 2008/04/11 11:39:26 ru Exp $ */ /* @@ -44,7 +44,6 @@ int *memory; int *swap; struct timeval boottime; - unsigned long cpumask; /* bitfield of cpu states represented */ int ncpus; }; ==== //depot/projects/mips2-jnpr/src/etc/defaults/rc.conf#4 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -105,6 +105,10 @@ #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. +wpa_supplicant_program="/usr/sbin/wpa_supplicant" +wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant +wpa_supplicant_conf_file="/etc/wpa_supplicant.conf" +# firewall_enable="NO" # Set to YES to enable firewall functionality firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) @@ -379,6 +383,19 @@ bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file +rfcomm_pppd_server_enable="NO" # Enable rfcomm_pppd(8) in server mode (or NO) +rfcomm_pppd_server_profile="one two" # Profile to use from /etc/ppp/ppp.conf +# +#rfcomm_pppd_server_one_bdaddr="" # Override local bdaddr for 'one' +rfcomm_pppd_server_one_channel="1" # Override local channel for 'one' +#rfcomm_pppd_server_one_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_one_register_dun="NO" # for 'one' +# +#rfcomm_pppd_server_two_bdaddr="" # Override local bdaddr for 'two' +rfcomm_pppd_server_two_channel="3" # Override local channel for 'two' +#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_two_register_dun="NO" # for 'two' + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ==== //depot/projects/mips2-jnpr/src/etc/rc.d/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.90 2008/04/08 23:34:12 emax Exp $ .include @@ -29,7 +29,7 @@ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - random rarpd resolv root \ + random rarpd resolv rfcomm_pppd_server root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ serial sppp statd swap1 \ ==== //depot/projects/mips2-jnpr/src/etc/rc.d/ppp#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.18 2008/03/28 07:57:51 brooks Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.20 2008/04/10 01:32:49 brooks Exp $ # # PROVIDE: ppp @@ -19,6 +19,7 @@ ppp_start_profile() { local _ppp_profile _ppp_mode _ppp_nat _ppp_unit + local _ppp_profile_cleaned _punct _punct_c _ppp_profile=$1 _ppp_profile_cleaned=$1 @@ -61,7 +62,7 @@ # Check for hard wired unit eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit - if [ -n "_ppp_unit" ]; then + if [ -n "${_ppp_unit}" ]; then _ppp_unit="-unit${_ppp_unit}" fi rc_flags="$rc_flags $_ppp_unit" ==== //depot/projects/mips2-jnpr/src/etc/rc.d/wpa_supplicant#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.2 2005/10/19 22:26:47 jkim Exp $ +# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $ # # PROVIDE: wpa_supplicant @@ -12,27 +12,43 @@ name="wpa_supplicant" rcvar= -command="/usr/sbin/${name}" -conf_file="/etc/wpa_supplicant.conf" ifn="$2" if [ -z "$ifn" ]; then return 1 fi +is_wired_interface() +{ + media=`ifconfig $1 2>/dev/null | while read line; do + case "$line" in + *media:?Ethernet*) + echo Ethernet + ;; + esac + done` + test "$media" = "Ethernet" +} + case ${ifn} in ndis*) driver="ndis" ;; *) - driver="bsd" + if is_wired_interface ${ifn} ; then + driver="wired" + else + driver="bsd" + fi ;; esac load_rc_config $name -pid_file="/var/run/${name}/${ifn}.pid" -command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file" +command=${wpa_supplicant_program} +conf_file=${wpa_supplicant_conf_file} +pidfile="/var/run/${name}/${ifn}.pid" +command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file run_rc_command "$1" ==== //depot/projects/mips2-jnpr/src/include/string.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.25 2005/11/24 08:30:44 ru Exp $ + * $FreeBSD: src/include/string.h,v 1.26 2008/04/10 00:12:43 delphij Exp $ */ #ifndef _STRING_H_ @@ -59,6 +59,7 @@ void *memccpy(void * __restrict, const void * __restrict, int, size_t); #endif void *memchr(const void *, int, size_t) __pure; +void *memrchr(const void *, int, size_t) __pure; int memcmp(const void *, const void *, size_t) __pure; void *memcpy(void * __restrict, const void * __restrict, size_t); #if __BSD_VISIBLE ==== //depot/projects/mips2-jnpr/src/include/unistd.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.86 2008/04/01 10:49:06 kib Exp $ + * $FreeBSD: src/include/unistd.h,v 1.87 2008/04/10 12:13:56 kib Exp $ */ #ifndef _UNISTD_H_ @@ -566,7 +566,7 @@ int fchownat(int, const char *, uid_t, gid_t, int); int fexecve(int, char *const [], char *const []); int linkat(int, const char *, int, const char *, int); -ssize_t readlinkat(int, const char *, char *, size_t); +ssize_t readlinkat(int, const char * __restrict, char * __restrict, size_t); int symlinkat(const char *, int, const char *); int unlinkat(int, const char *, int); #endif /* __BSD_VISIBLE */ ==== //depot/projects/mips2-jnpr/src/lib/libc/string/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.37 2006/03/13 01:15:00 deischen Exp $ +# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.38 2008/04/10 00:12:44 delphij Exp $ .PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string @@ -7,7 +7,7 @@ # machine-independent string sources MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c fls.c flsl.c index.c memccpy.c \ - memchr.c memcmp.c \ + memchr.c memrchr.c memcmp.c \ memcpy.c memmem.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c \ strcat.c strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c \ strerror.c strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c \ @@ -39,6 +39,7 @@ MLINKS+=ffs.3 fls.3 MLINKS+=ffs.3 flsl.3 MLINKS+=index.3 rindex.3 +MLINKS+=memchr.3 memrchr.3 MLINKS+=strcasecmp.3 strncasecmp.3 MLINKS+=strcat.3 strncat.3 MLINKS+=strchr.3 strrchr.3 ==== //depot/projects/mips2-jnpr/src/lib/libc/string/Symbol.map#2 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.2 2007/04/29 14:05:19 deischen Exp $ + * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.3 2008/04/10 00:12:44 delphij Exp $ */ FBSD_1.0 { @@ -77,6 +77,10 @@ wmemset; }; +FBSD_1.1 { + memrchr; +}; + FBSDprivate_1.0 { __strtok_r; }; ==== //depot/projects/mips2-jnpr/src/lib/libc/string/memchr.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)memchr.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.9 2007/01/09 00:28:12 imp Exp $ +.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.10 2008/04/10 00:12:44 delphij Exp $ .\" -.Dd June 4, 1993 +.Dd April 9, 2008 .Dt MEMCHR 3 .Os .Sh NAME @@ -44,6 +44,8 @@ .In string.h .Ft void * .Fn memchr "const void *b" "int c" "size_t len" +.Ft void * +.Fn memrchr "const void *b" "int c" "size_t len" .Sh DESCRIPTION The .Fn memchr @@ -53,11 +55,22 @@ (converted to an unsigned char) in string .Fa b . +.Pp +The +.Fn memrchr +function behaves like +.Fn memchr , +except that it locates the last occurrence of +.Fa c +in string +.Fa b . .Sh RETURN VALUES The .Fn memchr -function -returns a pointer to the byte located, +and +.Fn memrchr +functions +return a pointer to the byte located, or NULL if no such byte exists within .Fa len bytes. @@ -77,3 +90,15 @@ function conforms to .St -isoC . +.Pp +The +.Fn memrchr +function is a GNU extension and conforms to no standard. +.Sh HISTORY +The +.Fn memrchr +function first appeared in GNU libc 2.1.91, this implementation +first appeared in +.Fx 8.0 , +coming from +.Ox 4.3 . ==== //depot/projects/mips2-jnpr/src/lib/libc/sys/Symbol.map#6 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.13 2008/03/31 12:14:04 kib Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.14 2008/04/07 13:53:51 deischen Exp $ */ /* @@ -66,11 +66,6 @@ clock_settime; close; connect; - cpuset; - cpuset_getid; - cpuset_setid; - cpuset_getaffinity; - cpuset_setaffinity; dup; dup2; eaccess; @@ -335,6 +330,11 @@ }; FBSD_1.1 { + cpuset; + cpuset_getid; + cpuset_setid; + cpuset_getaffinity; + cpuset_setaffinity; faccessat; fchmodat; fchownat; ==== //depot/projects/mips2-jnpr/src/lib/libstand/nfs.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.12 2004/01/21 20:12:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.13 2008/04/05 15:03:29 dfr Exp $"); #include #include @@ -412,9 +412,16 @@ return (ENXIO); } + /* + * This is silly - we should look at dv_type but that value is + * arch dependant and we can't use it here. + */ #ifndef __i386__ if (strcmp(f->f_dev->dv_name, "net") != 0) return(EINVAL); +#else + if (strcmp(f->f_dev->dv_name, "pxe") != 0) + return(EINVAL); #endif if (!(desc = socktodesc(*(int *)(f->f_devdata)))) ==== //depot/projects/mips2-jnpr/src/libexec/rtld-elf/rtld.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.124 2007/05/17 18:00:27 csjp Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.125 2008/04/04 20:59:26 imp Exp $ */ /* ==== //depot/projects/mips2-jnpr/src/libexec/rtld-elf/rtld.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.38 2007/04/03 18:31:20 kan Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.39 2008/04/04 20:59:26 imp Exp $ */ #ifndef RTLD_H /* { */ ==== //depot/projects/mips2-jnpr/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 (text+ko) ==== @@ -20,7 +20,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1083 2008/03/31 05:06:00 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1084 2008/04/05 18:11:39 bmah Exp $ 2000 @@ -165,7 +165,7 @@ kernel bug reports that are rich in debugging information, but are not dependent on kernel symbol tables or precisely synchronized source code. More information can be found in the - &man.textdump.4; manual page. + &man.textdump.4; manual page. &merged; Kernel support for M:N threading has been removed. While the KSE (Kernel Scheduled Entities) project was quite successful @@ -184,6 +184,10 @@ [&arch.amd64;] The &os; kernel now has support for large memory page mappings (superpages). + [&arch.amd64;, &arch.i386;, &arch.powerpc;] The ULE + scheduler is now the default process scheduler + in GENERIC kernels. &merged; + Boot Loader Changes @@ -205,11 +209,11 @@ Hardware Support The &man.cmx.4; driver, a driver for Omnikey CardMan 4040 - PCMCIA smartcard readers, has been added. + PCMCIA smartcard readers, has been added. &merged; The &man.uslcom.4; driver, a driver for Silicon Laboratories CP2101/CP2102-based USB serial adapters, has been - imported from OpenBSD. + imported from OpenBSD. &merged; Multimedia Support @@ -271,6 +275,9 @@ Disks and Storage + The &man.aac.4; driver now supports volumes larger than + 2TB in size. &merged; + The &man.ata.4; driver now supports a spindown command for disks; after a configurable amount of time, if no requests have been received for a disk, the disk will be spun down @@ -289,12 +296,21 @@ A problem with using &man.mmap.2; on ZFS filesystems has been fixed. + A new kernel-mode NFS lock manager has been added, + improving performance and behavior of NFS locking. A new + &man.clear.locks.8; command has been added to clear locks held + on behalf of an NFS client. + Userland Changes + The &man.adduser.8; utility now supports + a option to set the mode of a new user's + home directory. &merged; + BSD-licensed versions of &man.ar.1; and &man.ranlib.1;, based on libarchive, have replaced the GNU Binutils versions of these utilities. @@ -316,6 +332,13 @@ command to make it easier to debug crash dumps with kernel modules. + The &man.ls.1; program now supports a + option to specify a date format string to be used with the long + format () output. + + &man.nc.1; now supports a switch to + disable the use of TCP options. + The &man.procstat.1; utility has been added to display detailed information about processes. @@ -395,7 +418,11 @@ Ports/Packages Collection Infrastructure - + The pkg_sign and pkg_check utilities for cryptographically + signing &os; packages have been removed. They were only useful + for packages compressed using &man.gzip.1;; however + &man.bzip2.1; compression has been the norm for some time + now. ==== //depot/projects/mips2-jnpr/src/release/ia64/mkisoimages.sh#2 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.11 2005/01/30 21:10:52 kensmith Exp $ +# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.12 2008/04/08 02:57:59 marcel Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -67,7 +67,7 @@ # To create a bootable CD under EFI, the boot image should be an EFI # system partition. if [ $bootable = yes ]; then - EFISZ=32768 + EFISZ=40960 MNT=/mnt dd if=/dev/zero of=$BASE/$EFIPART count=$EFISZ md=`mdconfig -a -t vnode -f $BASE/$EFIPART` ==== //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/fsck.h#2 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. * * @(#)fsck.h 8.4 (Berkeley) 5/9/95 - * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.37 2006/10/31 22:06:56 pjd Exp $ + * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.38 2008/04/10 23:49:23 delphij Exp $ */ #include @@ -270,6 +270,7 @@ int bkgrdflag; /* use a snapshot to run on an active system */ int bflag; /* location of alternate super block */ int debug; /* output debugging info */ +char catastrophicflag; /* run in catastrophic mode */ int cvtlevel; /* convert to newer file system format */ int bkgrdcheck; /* determine if background check is possible */ int bkgrdsumadj; /* whether the kernel have ability to adjust superblock summary */ @@ -335,6 +336,7 @@ void catch(int); void catchquit(int); int changeino(ino_t dir, const char *name, ino_t newnum); +void check_cgmagic(int cg, struct cg *cgp); int chkrange(ufs2_daddr_t blk, int cnt); void ckfini(int markclean); int ckinode(union dinode *dp, struct inodesc *); ==== //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/fsck_ffs.8#2 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)fsck.8 8.4 (Berkeley) 5/9/95 -.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34 2005/09/20 08:02:38 delphij Exp $ +.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.35 2008/04/10 23:49:23 delphij Exp $ .\" -.Dd April 24, 2001 +.Dd April 10, 2008 .Dt FSCK_FFS 8 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd file system consistency check and interactive repair .Sh SYNOPSIS .Nm -.Op Fl BFpfny +.Op Fl BCFpfny .Op Fl b Ar block .Op Fl c Ar level .Op Fl m Ar mode @@ -175,6 +175,26 @@ the super block for the file system. An alternate super block is usually located at block 32 for UFS1, and block 160 for UFS2. +.It Fl C +Run +.Nm +in 'catastrophic recovery' mode, which will enable certain aggressive +operations that can make +.Nm +to survive with file systems that has very serious data damage, which +is an useful last resort when on disk data damage is very serious +and causes +.Nm +to crash otherwise. Be +.Em very careful +using this flag, is dangerous if there are data transmission hazards +because a false positive cylinder group magic number mismatch could +cause +.Em irrevertible data loss! +.Pp +This option implies the +.Fl f +flag. .It Fl c Convert the file system to the specified level. Note that the level of a file system can only be raised. ==== //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/fsutil.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.26 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.27 2008/04/10 23:49:23 delphij Exp $"); #include #include @@ -418,6 +418,35 @@ } /* + * Check cg's magic number. If catastrophic mode is enabled and the cg's + * magic number is bad, offer an option to clear the whole cg. + */ +void +check_cgmagic(int cg, struct cg *cgp) +{ + + if (!cg_chkmagic(cgp)) { + pwarn("CG %d: BAD MAGIC NUMBER\n", cg); + if (catastrophicflag) { + if (reply("CLEAR CG")) { + memset(cgp, 0, (size_t)sblock.fs_cgsize); + cgp->cg_initediblk = sblock.fs_ipg; + cgp->cg_old_niblk = sblock.fs_ipg; + cgp->cg_old_ncyl = sblock.fs_old_cpg; + cgp->cg_cgx = cg; + cgp->cg_niblk = sblock.fs_ipg; + cgp->cg_ndblk = sblock.fs_size - cgbase(&sblock, cg); + cgp->cg_magic = CG_MAGIC; + cgdirty(); + printf("PLEASE RERUN FSCK.\n"); + rerun = 1; + } + } else + printf("YOU MAY NEED TO RERUN FSCK WITH -C IF IT CRASHED.\n"); + } +} + +/* * allocate a data block with the specified number of fragments */ ufs2_daddr_t @@ -441,8 +470,7 @@ } cg = dtog(&sblock, i + j); getblk(&cgblk, cgtod(&sblock, cg), sblock.fs_cgsize); - if (!cg_chkmagic(cgp)) - pfatal("CG %d: BAD MAGIC NUMBER\n", cg); + check_cgmagic(cg, cgp); baseblk = dtogd(&sblock, i + j); for (k = 0; k < frags; k++) { setbmap(i + j + k); ==== //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/inode.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.39 2008/04/10 23:49:23 delphij Exp $"); #include #include @@ -617,8 +617,7 @@ return (0); cg = ino_to_cg(&sblock, ino); getblk(&cgblk, cgtod(&sblock, cg), sblock.fs_cgsize); - if (!cg_chkmagic(cgp)) - pfatal("CG %d: BAD MAGIC NUMBER\n", cg); + check_cgmagic(cg, cgp); setbit(cg_inosused(cgp), ino % sblock.fs_ipg); cgp->cg_cs.cs_nifree--; switch (type & IFMT) { ==== //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/main.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.50 2008/04/04 01:50:58 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.51 2008/04/10 23:49:23 delphij Exp $"); #include #include @@ -81,7 +81,8 @@ sync(); skipclean = 1; - while ((ch = getopt(argc, argv, "b:Bc:dfFm:npy")) != -1) { + catastrophicflag = 0; + while ((ch = getopt(argc, argv, "b:Bc:CdfFm:npy")) != -1) { switch (ch) { case 'b': skipclean = 0; @@ -105,6 +106,10 @@ debug++; break; + case 'C': + catastrophicflag = 1; + /* FALLTHROUGH */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 11 23:06:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45ABA1065672; Fri, 11 Apr 2008 23:06:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07B0E106564A for ; Fri, 11 Apr 2008 23:06:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F2B358FC0C for ; Fri, 11 Apr 2008 23:06:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BN6erp088773 for ; Fri, 11 Apr 2008 23:06:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BN6eYA088771 for perforce@freebsd.org; Fri, 11 Apr 2008 23:06:40 GMT (envelope-from sam@freebsd.org) Date: Fri, 11 Apr 2008 23:06:40 GMT Message-Id: <200804112306.m3BN6eYA088771@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 Cc: Subject: PERFORCE change 139850 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2008 23:06:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=139850 Change 139850 by sam@sam_ebb on 2008/04/11 23:05:53 checkpoint Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#9 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifconfig.8#9 (text+ko) ==== @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.146 2008/02/29 20:42:17 sam Exp $ .\" -.Dd February 29, 2008 +.Dd April 11, 2008 .Dt IFCONFIG 8 .Os .Sh NAME @@ -586,6 +586,55 @@ .Pp The following parameters are specific to IEEE 802.11 wireless interfaces: .Bl -tag -width indent +.It Cm ampdu +Enable sending and receiving AMPDU frames when using 802.11n (default). +The 802.11n specification states a compliant station must be capable +of receiving AMPDU frames but transmision is optional. +Use +.Fl ampdu +to disable all use of AMPDU with 802.11n. +For testing and/or to work around interoperability problems one can use +.Cm ampdutx +and +.Cm ampdurx +to control use of AMPDU in one direction. +.It Cm ampdudensity +Set the AMPDU density parameter used when operating with 802.11n. +This parameter controls the inter-packet gap for AMPDU frames. +The sending device normally controls this setting but a receiving station +may request wider gaps. +Legal values are: 0, .25, .5, 1, 2, 4, 8, and 16. +A value of +.Cm - +is treated the same as 0. +.It Cm ampdulimit +Set the limit on packet size for receiving AMPDU frames when operating +with 802.11n. +Legal values are: 8192, 16384, 32768, and 65536 but one can also specify +just the unique prefix: 8, 16, 32, 64. +Note the sender may limit the size of AMPDU frames to be less +than the maximum specified by the receiving station. +.It Cm amsdu +Enable sending and receiving AMSDU frames when using 802.11n. +By default AMSDU is received but not transmitted. +Use +.Fl amsdu +to disable all use of AMSDU with 802.11n. +For testing and/or to work around interoperability problems one can use +.Cm amsdutx +and +.Cm amsdurx +to control use of AMSDU in one direction. +.It Cm amsdulimit +Set the limit on packet size for sending and receiving AMSDU frames +when operating with 802.11n. +Legal values are: 7935 and 3839 (bytes). +Note the sender may limit the size of AMSDU frames to be less +than the maximum specified by the receiving station. +Note also that devices are not required to support the 7935 limit, +only 3839 is required by the specification and the larger value +may require more memory to be dedicated to support functionality +that is rarely used. .It Cm apbridge When operating as an access point, pass packets between wireless clients directly (default). @@ -597,7 +646,7 @@ packet filtering. .It Cm authmode Ar mode Set the desired authentication mode in infrastructure mode. -Not all adaptors support all modes. +Not all adapters support all modes. The set of valid modes is .Cm none , open , shared @@ -725,7 +774,7 @@ .Cm - will give you the default for your adaptor. Some -adaptors ignore this setting unless you are in ad-hoc mode. +adapters ignore this setting unless you are in ad-hoc mode. Alternatively the frequency, in megahertz, may be specified instead of the channel number. .Pp @@ -770,9 +819,61 @@ of the extension channel by appending ``+'' or ``-'' for above and below, respectively; e.g. ``2437:ht/40+'' specifies 40MHz wide HT operation with the center channel at frequency 2437 and the extension channel above. +.It Cm country Ar name +Set the country code to use in calculating the regulatory constraints +for operation. +In particular the set of available channels, how the wireless device +will operation on the channels, and the maximum transmit power that +can be used on a channel are defined by this setting. +Country/Region codes are specified as a 2-character abbreviation +defined by ISO 3166 or using a longer, but possibly ambiguous, spelling; +e.g. "ES" and "Spain". +The set of country codes are taken from /etc/regdomain.xml and can also +be viewed with the ``list countries'' request. +Note that not all devices support changing the country code from a default +setting; typically stored in EEPROM. +See also +.Cm regdomain , +.Cm indoor , +.Cm outdoor , +and +.Cm anywhere . +.It Cm dfs +Enable Dynamic Frequency Selection (DFS) as specified in 802.11h. +DFS embodies several facilities including detection of overlapping +radar signals, dynamic transmit power control, and channel selection +according to a least-congested criteria. +DFS support is mandatory for some 5Ghz frequencies in certain +locales (e.g. ETSI). +By default DFS is enabled according to the regulatory definitions +specified in /etc/regdomain.xml and the curent country code, regdomain, +and channel. +Note the underlying device (and driver) must support radar detection +for full DFS support to work. +To be fully compliant with the local regulatory agency frequencies that +require DFS should not be used unless it is fully supported. +Use +.Fl dfs +to disable this functionality for testing. +.It Cm dotd +Enable support for the 802.11d specification (default). +When this support is enabled in station mode, beacon frames that advertise +a country code different than the currently configured country code will +cause an event to be dispatched to user applications. +This event can be used by the station to adopt that country code and +operate according to the associated regulatory constraints. +When operating as an access point with 802.11d enabled the beacon and +probe response frames transmitted will advertise the current regulatory +domain settings. +To disable 802.11d use +.Fl dotd . .It Cm doth -Enable inclusion of an 802.11h country information element in beacon -frames transmitted when operating as an access point. +Enable 802.11h support including spectrum management. +When 802.11h is enabled beacon and probe response frames will have +the SpectrumMgt bit set in the capabilities field and +country and power constraint information elements will be present. +802.11h support also includes handling Channel Switch Announcements (CSA) +which are a mechanism to coordinate channel changes by an access point. By default 802.11h is enabled if the device is capable. To disable 802.11h use .Fl doth . @@ -811,6 +912,48 @@ command to identify the channels where turbo mode may be used. To disable Dynamic Turbo mode use .Fl dturbo . +.It Cm dwds +Enable Dynamic WDS (DWDS) support. +DWDS is a facility by which 4-address traffic can be carried between +stations operating in infrastructure mode. +A station first associates to an access point and authenticates using +normal procedures (e.g. WPA). +Then 4-address frames are passed to carry traffic for stations +operating on either side of the wireless link. +DWDS extends the normal WDS mechanism by leveraging existing security +protocols and eliminating static binding. +.Pp +When DWDS is enabled on an access point 4-address frames received from +an authorized station will generate a ``DWDS discovery'' event to user +applications. +This event should be used to create a WDS interface that is bound +to the remote station (and usually plumbed into a bridge). +Once the WDS interface is up and running 4-address traffic then logically +flows through that interface. +.Pp +When DWDS is enabled on a station, traffic with a destination address +different from the peer station are encapsulated in a 4-address frame +and transmitted to the peer. +All 4-address traffic uses the security information of the stations +(e.g. cryptographic keys). +A station is associated using 802.11n facilities may transport +4-address traffic using these same mechanisms; this depends on available +resources and capabilities of the device. +The DWDS implementation guards against layer 2 routing loops of +multicast traffic. +.It Cm ff +Enable the use of Atheros Fast Frames when communicating with +another Fast Frames-capable station. +Fast Frames are an encapsulation technique by which two 802.3 +frames are transmitted in a single 802.11 frame. +This can noticeably improve throughput but requires that the +receiving station understand how to decapsulate the frame. +Fast frame use is negotiated using the Atheros 802.11 vendor-specific +protocol extension so enabling use is safe when communicating with +non-Atheros devices. +By default, use of fast frames is enabled if the device is capable. +To explicitly disable fast frames, use +.Fl ff . .It Cm fragthreshold Ar length Set the threshold for which transmitted frames are broken into fragments. The @@ -824,7 +967,7 @@ or .Cm - disables transmit fragmentation. -Not all adaptors honor the fragmentation threshold. +Not all adapters honor the fragmentation threshold. .It Cm hidessid When operating as an access point, do not broadcast the SSID in beacon frames or respond to probe request frames unless @@ -833,19 +976,76 @@ undirected probe request frames are answered. To re-enable the broadcast of the SSID etc., use .Fl hidessid . -.It Cm ff -Enable the use of Atheros Fast Frames when communicating with -another Fast Frames-capable station. -Fast Frames are an encapsulation technique by which two 802.3 -frames are transmitted in a single 802.11 frame. -This can noticeably improve throughput but requires that the -receiving station understand how to decapsulate the frame. -Fast frame use is negotiated using the Atheros 802.11 vendor-specific -protocol extension so enabling use is safe when communicating with -non-Atheros devices. -By default, use of fast frames is enabled if the device is capable. -To explicitly disable fast frames, use -.Fl ff . +.It Cm ht +Enable use of High Throughput (HT) when using 802.11n (default). +The 802.11n specification includes mechanisms for operation +on 20MHz and 40MHz wide channels using different signalling mechanisms +than specified in 802.11b, 802.11g, and 802.11a. +Stations negotiate use of these facilities, termed HT20 and HT40, +when they associate. +To disable all use of 802.11n use +.Fl ht . +To disable use of HT20 (e.g. to force only HT40 use) use +.Fl ht20 . +To disable use of HT40 use +.Fl ht40 . +.Pp +HT configuration is used to ``auto promote'' operation +when several choices are available. +For example, if a station associates to an 11n-capable access point +it controls whether the station uses legacy operation, HT20, or HT40. +When an 11n-capable device is setup as an access point and +Auto Channel Selection is used to locate a channel to operate on, +HT configuration controls whether legacy, HT20, or HT40 operation is setup +on the selected channel. +If a fixed channel is specified for a station then HT configuration can +be given as part of the channel specification; e.g. 6:ht/20 to setup +HT20 operation on channel 6. +.It Cm htcompat +Enable use of compatibility support for pre-802.11n devices (default). +The 802.11n protocol specification went through several incompatible iterations. +Some vendors implemented 11n support to older specifications that +will not interoperate with a purely 11n-compliant station. +In particular the information elements included in management frames +for old devices are different. +When compatibility support is enabled both standard and compatible data +will be provided. +Stations that associate using the compatiblity mechanisms are flagged +in ``list sta''. +To disable compatiblity support use +.Fl htcompat . +.It Cm htprotmode Ar technique +For interfaces operating in 802.11n, use the specified +.Ar technique +for protecting HT frames in a mixed legacy/HT network. +The set of valid techniques is +.Cm off , +and +.Cm rts +(RTS/CTS, default). +Technique names are case insensitive. +.It Cm inact +Enable inactivity processing for stations associated to an +access point (default). +When operating as an access point the 802.11 layer monitors +the activity of each associated station. +When a station is inactive for 5 minutes it will send several +``probe frames'' to see if the station is still present. +If no response is received then the station is deauthenticated. +Applications that prefer to handle this work can disable this +facility by using +.Fl inact . +.It Cm indoor +Set the location to use in calculating regulatory constraints. +The location is also advertised in beacon and probe response frames +when 802.11d is enabled with +.Cm dotd . +See also +.Cm outdoor , +.Cm anywhere , +.Cm country , +and +.Cm regdomain . .It Cm list active Display the list of channels available for use taking into account any restrictions set with the @@ -883,6 +1083,9 @@ By default a compacted list of channels is displayed; if the .Fl v option is specified then all channels are shown. +.It Cm list countries +Display the set of country codes and regulatory domains that can be +used in regulatory configuration. .It Cm list mac Display the current MAC Access Control List state. Each address is prefixed with a character that indicates the @@ -894,6 +1097,13 @@ .Ql * indicates the address is present but the current policy open (so the ACL is not consulted). +.It Cm list regdomain +Display the current regulatory settings including the available channels +and transmit power caps. +.It Cm list roam +Display the parameters that govern roaming operation. +.It Cm list txparam +Display the parameters that govern transmit operation. .It Cm list scan Display the access points and/or ad-hoc neighbors located in the vicinity. @@ -1102,7 +1312,7 @@ or .Cm - disables transmission of RTS frames. -Not all adaptors support setting the RTS threshold. +Not all adapters support setting the RTS threshold. .It Cm ssid Ar ssid Set the desired Service Set Identifier (aka network name). The SSID is a string up to 32 characters @@ -1217,10 +1427,10 @@ Out of range values are truncated. Typically only a few discreet power settings are available and the driver will use the setting closest to the specified value. -Not all adaptors support changing the transmit power. +Not all adapters support changing the transmit power. .It Cm wepmode Ar mode Set the desired WEP mode. -Not all adaptors support all modes. +Not all adapters support all modes. The set of valid modes is .Cm off , on , and @@ -1229,10 +1439,10 @@ .Cm mixed mode explicitly tells the adaptor to allow association with access points which allow both encrypted and unencrypted traffic. -On these adaptors, +On these adapters, .Cm on means that the access point must only allow encrypted connections. -On other adaptors, +On other adapters, .Cm on is generally another name for .Cm mixed . @@ -1261,7 +1471,7 @@ A key may be cleared by setting it to .Ql - . If WEP is supported then there are at least four keys. -Some adaptors support more than four keys. +Some adapters support more than four keys. If that is the case, then the first four keys (1-4) will be the standard temporary keys and any others will be adaptor specific keys such as permanent keys stored in NVRAM. @@ -1365,7 +1575,7 @@ .El .Pp The following parameters support an optional access control list -feature available with some adaptors when operating in ap mode; see +feature available with some adapters when operating in ap mode; see .Xr wlan_acl 4 . This facility allows an access point to accept/deny association requests based on the MAC address of the station. @@ -1392,6 +1602,14 @@ Set the ACL policy to allow all stations to associate. .It Cm mac:flush Delete all entries in the database. +.It Cm mac:radius +Set the ACL policy to permit association only by +stations approved by a RADIUS server. +Note that this feature requires the +.Xr hostapd 8 +program be configured to do the right thing +as it handles the RADIUS processing +(and marks stations as authorized). .El .Pp The following parameters are for compatibility with other systems: From owner-p4-projects@FreeBSD.ORG Sat Apr 12 10:11:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 140EF1065671; Sat, 12 Apr 2008 10:11:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9B9F106566B for ; Sat, 12 Apr 2008 10:11:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C80358FC1A for ; Sat, 12 Apr 2008 10:11:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CABeRf052733 for ; Sat, 12 Apr 2008 10:11:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CABdLH052731 for perforce@freebsd.org; Sat, 12 Apr 2008 10:11:39 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 12 Apr 2008 10:11:39 GMT Message-Id: <200804121011.m3CABdLH052731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 139870 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 10:11:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=139870 Change 139870 by hselasky@hselasky_laptop001 on 2008/04/12 10:10:52 Style change: Prototypes should be in one line. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ugen.c#41 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#41 (text+ko) ==== @@ -146,23 +146,12 @@ static usbd_callback_t ugenisoc_read_callback; static usbd_callback_t ugenisoc_write_callback; -static void - ugen_make_devnodes(struct ugen_softc *sc); - -static void - ugen_destroy_devnodes(struct ugen_softc *sc, int skip_first); - -static int - ugen_set_config(struct ugen_softc *sc, int configno); - -static int - ugen_set_interface(struct ugen_softc *sc, int ifaceidx, int altno); - -static usb_config_descriptor_t * - ugen_get_cdesc(struct usbd_device *udev, int index, int *lenp); - -static int - ugen_get_alt_index(struct usbd_device *udev, int ifaceidx); +static void ugen_make_devnodes(struct ugen_softc *sc); +static void ugen_destroy_devnodes(struct ugen_softc *sc, int skip_first); +static int ugen_set_config(struct ugen_softc *sc, int configno); +static int ugen_set_interface(struct ugen_softc *sc, int ifaceidx, int altno); +static usb_config_descriptor_t *ugen_get_cdesc(struct usbd_device *udev, int index, int *lenp); +static int ugen_get_alt_index(struct usbd_device *udev, int ifaceidx); #define UGENMINOR(unit, endpoint) (((unit) << 4) | (endpoint)) From owner-p4-projects@FreeBSD.ORG Sat Apr 12 15:25:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 455611065677; Sat, 12 Apr 2008 15:25:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06CD1106564A for ; Sat, 12 Apr 2008 15:25:52 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D1A458FC18 for ; Sat, 12 Apr 2008 15:25:51 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CFPpX4078475 for ; Sat, 12 Apr 2008 15:25:51 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CFPp49078473 for perforce@freebsd.org; Sat, 12 Apr 2008 15:25:51 GMT (envelope-from csjp@freebsd.org) Date: Sat, 12 Apr 2008 15:25:51 GMT Message-Id: <200804121525.m3CFPp49078473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 139896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 15:25:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=139896 Change 139896 by csjp@ibm01 on 2008/04/12 15:25:42 Assert that the handler is not NULL Affected files ... .. //depot/projects/trustedbsd/netauditd/writer.c#3 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/writer.c#3 (text+ko) ==== @@ -102,6 +102,7 @@ (void) pthread_mutex_lock(&ac->ac_q.qp_lock); if (ac->ac_q.qp_hold != NULL) { (void) pthread_mutex_unlock(&ac->ac_q.qp_lock); + assert(ac->ac_write_func != NULL); ret = ac->ac_write_func(ac); if (ret == 1) /* Queue has been drained */ writer_q_drained(ac); From owner-p4-projects@FreeBSD.ORG Sat Apr 12 15:55:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8562A1065680; Sat, 12 Apr 2008 15:55:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 46299106564A for ; Sat, 12 Apr 2008 15:55:24 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 18DAE8FC1D for ; Sat, 12 Apr 2008 15:55:24 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CFtNPJ079440 for ; Sat, 12 Apr 2008 15:55:23 GMT (envelope-from alm@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CFtNfk079438 for perforce@freebsd.org; Sat, 12 Apr 2008 15:55:23 GMT (envelope-from alm@freebsd.org) Date: Sat, 12 Apr 2008 15:55:23 GMT Message-Id: <200804121555.m3CFtNfk079438@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alm@freebsd.org using -f From: Aaron Meihm To: Perforce Change Reviews Cc: Subject: PERFORCE change 139901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 15:55:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=139901 Change 139901 by alm@alm_praetorian on 2008/04/12 15:54:55 Return immediately from writer_handler() on select timeout. Affected files ... .. //depot/projects/trustedbsd/netauditd/writer.c#4 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/writer.c#4 (text+ko) ==== @@ -80,6 +80,8 @@ else exit(2); } + else if (ret == 0) + return; (void) pthread_mutex_lock(&ready_lock); if (records_waiting == 0) { have_records = 0; From owner-p4-projects@FreeBSD.ORG Sat Apr 12 15:58:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E03C71065675; Sat, 12 Apr 2008 15:58:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A65A5106564A for ; Sat, 12 Apr 2008 15:58:27 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 915FD8FC17 for ; Sat, 12 Apr 2008 15:58:27 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CFwRQj079554 for ; Sat, 12 Apr 2008 15:58:27 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CFwRKq079552 for perforce@freebsd.org; Sat, 12 Apr 2008 15:58:27 GMT (envelope-from csjp@freebsd.org) Date: Sat, 12 Apr 2008 15:58:27 GMT Message-Id: <200804121558.m3CFwRKq079552@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 139902 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 15:58:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=139902 Change 139902 by csjp@ibm01 on 2008/04/12 15:58:26 Allocate a timeval on the stack and conditionally initialize the timeout if we need it. If so, initialize the timeval pointer to the stack to avoid potentially expensive malloc calls. Affected files ... .. //depot/projects/trustedbsd/netauditd/writer.c#5 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/writer.c#5 (text+ko) ==== @@ -63,17 +63,18 @@ { struct au_cmpnt *ac; fd_set lwfds; - struct timeval *tv = NULL; + struct timeval *tvp, tv; int ret, have_records = 1; lwfds = *wfds; + tvp = NULL; if (!dsts_online) { dprintf("writer applying select timeout"); - tv = malloc(sizeof(struct timeval)); - bzero(tv, sizeof(struct timeval)); - tv->tv_sec = 1; + tv.tv_sec = 1; + tv.tv_usec = 0; + tvp = &tv; } - ret = select(FD_SETSIZE, NULL, &lwfds, NULL, tv); + ret = select(FD_SETSIZE, NULL, &lwfds, NULL, tvp); if (ret == -1) { if (errno == EINTR) return; From owner-p4-projects@FreeBSD.ORG Sat Apr 12 16:11:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B07D91065672; Sat, 12 Apr 2008 16:11:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A12C106566C for ; Sat, 12 Apr 2008 16:11:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 422C68FC2E for ; Sat, 12 Apr 2008 16:11:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CGBf1B081628 for ; Sat, 12 Apr 2008 16:11:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CGBfEj081626 for perforce@freebsd.org; Sat, 12 Apr 2008 16:11:41 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Apr 2008 16:11:41 GMT Message-Id: <200804121611.m3CGBfEj081626@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 Cc: Subject: PERFORCE change 139904 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 16:11:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=139904 Change 139904 by sam@sam_ebb on 2008/04/12 16:11:29 fill in more stuff Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#10 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifconfig.8#10 (text+ko) ==== @@ -598,19 +598,23 @@ and .Cm ampdurx to control use of AMPDU in one direction. -.It Cm ampdudensity +.It Cm ampdudensity Ar density Set the AMPDU density parameter used when operating with 802.11n. This parameter controls the inter-packet gap for AMPDU frames. The sending device normally controls this setting but a receiving station may request wider gaps. -Legal values are: 0, .25, .5, 1, 2, 4, 8, and 16. +Legal values for +.Ar density +are 0, .25, .5, 1, 2, 4, 8, and 16 (microseconds). A value of .Cm - is treated the same as 0. -.It Cm ampdulimit +.It Cm ampdulimit Ar limit Set the limit on packet size for receiving AMPDU frames when operating with 802.11n. -Legal values are: 8192, 16384, 32768, and 65536 but one can also specify +Legal values for +.Ar limit +are 8192, 16384, 32768, and 65536 but one can also specify just the unique prefix: 8, 16, 32, 64. Note the sender may limit the size of AMPDU frames to be less than the maximum specified by the receiving station. @@ -625,10 +629,12 @@ and .Cm amsdurx to control use of AMSDU in one direction. -.It Cm amsdulimit +.It Cm amsdulimit Ar limit Set the limit on packet size for sending and receiving AMSDU frames when operating with 802.11n. -Legal values are: 7935 and 3839 (bytes). +Legal values for +.Ar limit +are 7935 and 3839 (bytes). Note the sender may limit the size of AMSDU frames to be less than the maximum specified by the receiving station. Note also that devices are not required to support the 7935 limit, @@ -1104,18 +1110,72 @@ Display the parameters that govern roaming operation. .It Cm list txparam Display the parameters that govern transmit operation. +.It Cm list txpower +Display the transmit power caps for each channel. .It Cm list scan Display the access points and/or ad-hoc neighbors located in the vicinity. -The +This information may be updated automatically by the adapter +with a +.Cm scan +request or through background scanning. +Depending on the capabilities of the stations the following +flags can be included in the output: +.Bl -tag -width 3n +.It Li A +Authorized. +Indicates that the station is permitted to send/receive data frames. +.It Li E +Extended Rate Phy (ERP). +Indicates that the station is operating in an 802.11g network +using extended transmit rates. +.It Li H +High Throughput (HT). +Indicates that the station is using HT transmit rates. +If a `+' follows immediately after then the station associated +using deprecated mechanisms supported only when +.Cm htcompat +is enabled. +.It Li P +Power Save. +Indicates that the station is operating in power save mode. +.It Li Q +Quality of Service (QoS). +Indicates that the station is using QoS encapsulation for +data frame. +QoS encapsulation is enabled only when WME mode is enabled. +.It Li T +Transitional Security Network (TSN). +Indicates that the station associated using TSN; see also +.Cm tsn +below. +.It Li W +Wi-Fi Protected Setup (WPS). +Indicates that the station associated using WPS. +.El +.Pp +By default interesting information elements captured from the neighboring +stations are displayed at the end of each row. +Possible elements include: +.Cm WME +(station supports WME), +.Cm WPA +(station supports WPA), +.Cm RSN +(station supports 802.11i/RSN), +.Cm HTCAP +(station supports 802.11n/HT communication), +.Cm ATH +(station supoprts Atheros protocol extensions), +.Cm VEN +(station supports unknown vendor-specific extensions). +If the .Fl v -flag may be used to display long SSIDs. +flag is used all the information elements and their +contents will be shown. +Specifying The .Fl v -also causes received information elements to be displayed symbolicaly. -This information may be updated automatically by the adaptor -and/or with a -.Cm scan -request or through background scanning. +flag also enables display of long SSIDs. .Cm list ap is another way of requesting this information. .It Cm list sta @@ -1140,7 +1200,11 @@ using extended transmit rates. .It Li H High Throughput (HT). -Indicates that the station is using MCS to send/receive frames. +Indicates that the station is using HT transmit rates. +If a `+' follows immediately after then the station associated +using deprecated mechanisms supported only when +.Cm htcompat +is enabled. .It Li P Power Save. Indicates that the station is operating in power save mode. @@ -1149,6 +1213,14 @@ Indicates that the station is using QoS encapsulation for data frame. QoS encapsulation is enabled only when WME mode is enabled. +.It Li T +Transitional Security Network (TSN). +Indicates that the station associated using TSN; see also +.Cm tsn +below. +.It Li W +Wi-Fi Protected Setup (WPS). +Indicates that the station associated using WPS. .El .Pp By default information elements received from associated stations @@ -1163,12 +1235,30 @@ See the description of the .Cm wme directive for information on the various parameters. +.It Cm maxretry Ar count +Set the maximum number of tries to use in sending unicast frames. +The default setting is 6 but drivers may override this with a value +they choose. .It Cm mcastrate Ar rate Set the rate for transmitting multicast/broadcast frames. Rates are specified as megabits/second in decimal; e.g.\& 5.5 for 5.5 Mb/s. This rate should be valid for the current operating conditions; if an invalid rate is specified drivers are free to chose an appropriate rate. +.It Cm mgtrate Ar rate +Set the rate for transmitting management and/or control frames. +Rates are specified as megabits/second in decimal; e.g.\& 5.5 for 5.5 Mb/s. +.It Cm outdoor +Set the location to use in calculating regulatory constraints. +The location is also advertised in beacon and probe response frames +when 802.11d is enabled with +.Cm dotd . +See also +.Cm anywhere , +.Cm country , +.Cm indoor , +and +.Cm regdomain . .It Cm powersave Enable powersave operation. When operating as a client, the station will conserve power by @@ -1204,6 +1294,60 @@ permitted to associate). To allow both 11g and 11b-only stations to associate, use .Fl pureg . +.It Cm puren +When operating as an access point in 802.11n mode allow only +HT-capable stations to associate (legacy stations are not +permitted to associate). +To allow both HT and legacy stations to associate, use +.Fl puren . +.It Cm regdomain Ar sku +Set the regulatory domain to use in calculating the regulatory constraints +for operation. +In particular the set of available channels, how the wireless device +will operation on the channels, and the maximum transmit power that +can be used on a channel are defined by this setting. +Regdomain codes (SKU's) are taken from /etc/regdomain.xml and can also +be viewed with the ``list countries'' request. +Note that not all devices support changing the regdomain from a default +setting; typically stored in EEPROM. +See also +.Cm country , +.Cm indoor , +.Cm outdoor , +and +.Cm anywhere . +.It Cm roam:rate Ar rate +Set the threshold for controlling roaming when operating in a BSS. +The +.Ar rate +parameter specifies the transmit rate in megabits +at which roaming should be considered. +If the current transmit rate drops below this setting and background scanning +is enabled, then the system will check if a more desirable access point is +available and switch over to it. +The current scan cache contents are used if they are considered +valid according to the +.Cm scanvalid +parameter; otherwise a background scan operation is triggered before +any selection occurs. +Each channel type has a separate rate threshold; the default values are: +12 Mb/s (11a), 2 Mb/s (11b), 2 Mb/s (11g), MCS 1 (11na, 11ng). +.It Cm roam:rssi Ar rssi +Set the threshold for controlling roaming when operating in a BSS. +The +.Ar rssi +parameter specifies the receive signal strength in dBm units +at which roaming should be considered. +If the current rssi drops below this setting and background scanning +is enabled, then the system will check if a more desirable access point is +available and switch over to it. +The current scan cache contents are used if they are considered +valid according to the +.Cm scanvalid +parameter; otherwise a background scan operation is triggered before +any selection occurs. +Rach channel type has a separate rssi threshold; the default values are +all 7 dBm. .It Cm roaming Ar mode When operating as a station, control how the system will behave when communication with the current access point @@ -1223,78 +1367,6 @@ Manual mode is used by applications such as .Xr wpa_supplicant 8 that want to control the selection of an access point. -.It Cm roam:rssi11a Ar rssi -Set the threshold for controlling roaming when operating in an -802.11a BSS. -The -.Ar rssi -parameter specifies the receive signal strength in dBm units -at which roaming should be considered. -If the current rssi drops below this setting and background scanning -is enabled, then the system will check if a more desirable access point is -available and switch over to it. -The current scan cache contents are used if they are considered -valid according to the -.Cm scanvalid -parameter; otherwise a background scan operation is triggered before -any selection occurs. -By default -.Ar rssi -is set to 7 dBm. -.It Cm roam:rssi11b Ar rssi -Set the threshold for controlling roaming when operating in an -802.11b-only BSS. -See -.Cm roam:rssi11a -for a description of this parameter. -By default -.Ar rssi -is set to 7 dBm. -.It Cm roam:rssi11g Ar rssi -Set the threshold for controlling roaming when operating in a -(mixed) 802.11g BSS. -See -.Cm roam:rssi11a -for a description of this parameter. -By default -.Ar rssi -is set to 7 dBm. -.It Cm roam:rate11a Ar rate -Set the threshold for controlling roaming when operating in an -802.11a BSS. -The -.Ar rate -parameter specifies the transmit rate in megabits -at which roaming should be considered. -If the current transmit rate drops below this setting and background scanning -is enabled, then the system will check if a more desirable access point is -available and switch over to it. -The current scan cache contents are used if they are considered -valid according to the -.Cm scanvalid -parameter; otherwise a background scan operation is triggered before -any selection occurs. -By default -.Ar rate -is set to 12 Mb/s. -.It Cm roam:rate11b Ar rate -Set the threshold for controlling roaming when operating in an -802.11b-only BSS. -See -.Cm roam:rate11a -for a description of this parameter. -By default -.Ar rate -is set to 1 Mb/s. -.It Cm roam:rate11g Ar rate -Set the threshold for controlling roaming when operating in a -(mixed) 802.11g BSS. -See -.Cm roam:rate11a -for a description of this parameter. -By default -.Ar rate -is set to 5 Mb/s. .It Cm rtsthreshold Ar length Set the threshold for which transmitted frames are preceded by transmission of an @@ -1313,92 +1385,19 @@ .Cm - disables transmission of RTS frames. Not all adapters support setting the RTS threshold. -.It Cm ssid Ar ssid -Set the desired Service Set Identifier (aka network name). -The SSID is a string up to 32 characters -in length and may be specified as either a normal string or in -hexadecimal when preceded by -.Ql 0x . -Additionally, the SSID may be cleared by setting it to -.Ql - . .It Cm scan Initiate a scan of neighboring stations, wait for it to complete, and display all stations found. Only the super-user can initiate a scan. -Depending on the capabilities of the APs, the following -flags can be included in the output: -.Bl -tag -width 3n -.It Li A -Channel Agility. -Indicates that the station support channel hopping as described by the -IEEE 802.11b specification. -.It Li B -Packet Binary Convolution Code (PBCC). -A modulation alternative to the standard OFDM method. -.It Dv C -Pollreq -.It Dv c -Pollable -.It Dv D -Direct Sequence Spread Spectrum (DSSSOFDM). -Indicates the the station supports DSSS modulation. -.It Li E -Extended Service Set (ESS). -Indicates that the station is part of an infrastructure network -(in contrast to an IBSS/ad-hoc network). -.It Li I -IBSS/ad-hoc network. -Indicates that the station is part of an ad-hoc network -(in contrast to an ESS network). -.It Li P -Privacy. -Data confidentiality is required for all data frames -exchanged within the BSS. -This means that this BSS requires the station to -use cryptographic means such as WEP, TKIP or AES-CCMP to -encrypt/decrypt data frames being exchanged with others. -.It Dv R -Robust Security Network (RSN). -Indicates that the station supports the IEEE 802.11i authentication -and key management protocol. -.It Li S -Short Preamble. -Indicates that the network is using short preambles (defined -in 802.11b High Rate/DSSS PHY, short preamble utilizes a -56 bit sync field in contrast to a 128 bit field used in long -preamble mode). -.It Li s -Short slot time. -Indicates that the network is using a short slot time. -.El -.Pp -Interesting information elements captured from the neighboring -stations are displayed at the end of each row. -Possible elements are: -.Cm WME -(station supports WME), -.Cm WPA -(station supports WPA), -.Cm RSN -(station supports 802.11i/RSN), -.Cm HT -(station supports 802.11n/HT communication), -.Cm ATH -(station supoprts Atheros protocol extensions), -.Cm VEN -(station supports unknown vendor-specific extensions). -If the -.Fl v -flag is used the information element contents will be shown. -.Pp +See +.Cm list scan +for information on the display. +By default a background scan is done; otherwise a foreground +scan is done and the station may roam to a different access point. The .Cm list scan request can be used to show recent scan results without initiating a new scan. -.Pp -The -.Fl v -flag may be used to prevent the shortening of long SSIDs. .It Cm scanvalid Ar threshold Set the maximum time the scan cache contents are considered valid; i.e. will be used without first triggering a scan operation to @@ -1412,13 +1411,25 @@ One should take care setting this threshold; if it is set too low then attempts to roam to another access point may trigger unnecessary background scan operations. -.It Cm stationname Ar name -Set the name of this station. -The station name is not part of the IEEE 802.11 -protocol though some interfaces support it. -As such it only -seems to be meaningful to identical or virtually identical equipment. -Setting the station name is identical in syntax to setting the SSID. +.It Cm shortgi +Enable use of Short Guard Interval when operating in 802.11n +on an HT channel. +NB: this currently enables Short GI on both HT40 and HT20 channels. +To disable Short GI use +.Fl shortgi . +.It Cm ssid Ar ssid +Set the desired Service Set Identifier (aka network name). +The SSID is a string up to 32 characters +in length and may be specified as either a normal string or in +hexadecimal when preceded by +.Ql 0x . +Additionally, the SSID may be cleared by setting it to +.Ql - . +.It Cm tsn +When operating as an access point with WPA/802.11i allow legacy +stations to associate using static key WEP and open authentication. +To disallow legacy station use of WEP, use +.Fl tsn . .It Cm txpower Ar power Set the power used to transmit frames. The @@ -1428,6 +1439,12 @@ Typically only a few discreet power settings are available and the driver will use the setting closest to the specified value. Not all adapters support changing the transmit power. +.It Cm ucastrate Ar rate +Set a fixed rate for transmitting unicast frames. +Rates are specified as megabits/second in decimal; e.g.\& 5.5 for 5.5 Mb/s. +This rate should be valid for the current operating conditions; +if an invalid rate is specified drivers are free to chose an +appropriate rate. .It Cm wepmode Ar mode Set the desired WEP mode. Not all adapters support all modes. @@ -1486,6 +1503,8 @@ efficient communication of realtime and multimedia data. To disable WME support, use .Fl wme . +Another name for this parameter is +.Cm wmm . .Pp The following parameters are meaningful only when WME support is in use. Parameters are specified per-AC (Access Category) and @@ -1572,6 +1591,11 @@ Set the TxOpLimit channel access parameter to send to stations in a BSS. This parameter is meaningful only when operating in ap mode. .El +.It Cm wps +Enable Wireless Privacy Subscriber support. +Note that WPS support requires a WPS-capable supplicant. +To disable this function use +.Fl wps . .El .Pp The following parameters support an optional access control list @@ -1621,11 +1645,16 @@ Included for .Nx compatibility. -.It Cm station Ar name -Another name for the -.Cm stationname -parameter. -Included for +.It Cm stationname Ar name +Set the name of this station. +The station name is not part of the IEEE 802.11 +protocol though some interfaces support it. +As such it only +seems to be meaningful to identical or virtually identical equipment. +Setting the station name is identical in syntax to setting the SSID. +One can also use +.Cm station +for .Bsx compatibility. .It Cm wep From owner-p4-projects@FreeBSD.ORG Sat Apr 12 16:33:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AA921065671; Sat, 12 Apr 2008 16:33:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D017D106566C for ; Sat, 12 Apr 2008 16:33:03 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B65B48FC13 for ; Sat, 12 Apr 2008 16:33:03 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CGX3sI082291 for ; Sat, 12 Apr 2008 16:33:03 GMT (envelope-from alm@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CGX3LM082289 for perforce@freebsd.org; Sat, 12 Apr 2008 16:33:03 GMT (envelope-from alm@freebsd.org) Date: Sat, 12 Apr 2008 16:33:03 GMT Message-Id: <200804121633.m3CGX3LM082289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alm@freebsd.org using -f From: Aaron Meihm To: Perforce Change Reviews Cc: Subject: PERFORCE change 139907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 16:33:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=139907 Change 139907 by alm@alm_praetorian on 2008/04/12 16:32:26 In most cases we will have a 1:1 relationship between source and destination components. We reference count usage of the audit record to avoid an extra copy. This may be built upon to avoid copies altogether. Affected files ... .. //depot/projects/trustedbsd/netauditd/netauditd.h#14 edit .. //depot/projects/trustedbsd/netauditd/reader.c#4 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/netauditd.h#14 (text+ko) ==== @@ -37,6 +37,7 @@ struct audit_record { void *ar_buf; + int ar_count; u_int32_t ar_record_len; }; ==== //depot/projects/trustedbsd/netauditd/reader.c#4 (text+ko) ==== @@ -212,9 +212,6 @@ for (i = 0; i < ac->ac_ndsts; i++) reader_q_record_cmpnt(ar, ac->ac_dsts[i]); - /* Once we have copied the record to all this components consumers - * we can discard it. */ - free(ar->ar_buf); free(ar); } @@ -226,9 +223,20 @@ new = malloc(sizeof(struct au_queue_ent)); assert(new != NULL); bzero(new, sizeof(struct au_queue_ent)); - new->aq_record.ar_buf = malloc(ar->ar_record_len); - assert(new->aq_record.ar_buf != NULL); - bcopy(ar->ar_buf, new->aq_record.ar_buf, ar->ar_record_len); + /* + * In most cases we will have a 1:1 relationship between source + * and destination components. We avoid an extra copy by reference + * counting usage of this audit record. This may be built on to + * avoid copying altogether. + */ + if (ar->ar_count == 0) + new->aq_record.ar_buf = ar->ar_buf; + else { + new->aq_record.ar_buf = malloc(ar->ar_record_len); + assert(new->aq_record.ar_buf != NULL); + bcopy(ar->ar_buf, new->aq_record.ar_buf, ar->ar_record_len); + } + ar->ar_count++; new->aq_record.ar_record_len = ar->ar_record_len; new->aq_remain = ar->ar_record_len; (void) pthread_mutex_lock(&ac->ac_q.qp_lock); From owner-p4-projects@FreeBSD.ORG Sat Apr 12 16:59:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 496FA1065673; Sat, 12 Apr 2008 16:59:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C19C1065671 for ; Sat, 12 Apr 2008 16:59:35 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E329D8FC1B for ; Sat, 12 Apr 2008 16:59:34 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CGxYNb093233 for ; Sat, 12 Apr 2008 16:59:34 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CGxYo1093231 for perforce@freebsd.org; Sat, 12 Apr 2008 16:59:34 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 12 Apr 2008 16:59:34 GMT Message-Id: <200804121659.m3CGxYo1093231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 139911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 16:59:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=139911 Change 139911 by gonzo@gonzo_jeeves on 2008/04/12 16:58:46 o Add proper implementation of pmap_mapdev for physical addresses greater then 512M. Implementation and comment come from arm/arm/pmap.c Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#27 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#27 (text+ko) ==== @@ -2758,13 +2758,38 @@ */ /* - * Note I don't know if any of this will work if pa is above - * 512Meg. + * Map a set of physical memory pages into the kernel virtual + * address space. Return a pointer to where it is mapped. This + * routine is intended to be used for mapping device memory, + * NOT real memory. */ void * pmap_mapdev(vm_offset_t pa, vm_size_t size) { - return ((void *)(MIPS_PHYS_TO_UNCACHED(pa))); + vm_offset_t va, tmpva, offset; + + /* + * KSEG1 maps only first 512M of phys address space. For + * pa > 0x20000000 we should make proper mapping * using pmap_kenter. + */ + if (pa + size < MIPS_KSEG0_LARGEST_PHYS) + return (void *)MIPS_PHYS_TO_KSEG1(pa); + else { + offset = pa & PAGE_MASK; + size = roundup(size, PAGE_SIZE); + + va = kmem_alloc_nofault(kernel_map, size); + if (!va) + panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); + for (tmpva = va; size > 0;) { + pmap_kenter(tmpva, pa); + size -= PAGE_SIZE; + tmpva += PAGE_SIZE; + pa += PAGE_SIZE; + } + } + + return ((void *)(va + offset)); } void From owner-p4-projects@FreeBSD.ORG Sat Apr 12 17:01:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8ADBC1065670; Sat, 12 Apr 2008 17:01:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D3A1106567E for ; Sat, 12 Apr 2008 17:01:37 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2FDB88FC14 for ; Sat, 12 Apr 2008 17:01:37 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CH1bYQ093351 for ; Sat, 12 Apr 2008 17:01:37 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CH1bWE093349 for perforce@freebsd.org; Sat, 12 Apr 2008 17:01:37 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 12 Apr 2008 17:01:37 GMT Message-Id: <200804121701.m3CH1bWE093349@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 139912 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 17:01:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=139912 Change 139912 by gonzo@gonzo_jeeves on 2008/04/12 17:00:57 o Use pmap_mapdev to map memory resource to KVA properly. Code obtained from FreeBSD/arm. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#7 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#7 (text+ko) ==== @@ -368,9 +368,16 @@ * in the uncached MIPS KSEG1 segment. */ if (type == SYS_RES_MEMORY) { - void *vaddr; + caddr_t vaddr = 0; + u_int32_t paddr; + u_int32_t psize; + u_int32_t poffs; + + paddr = rman_get_start(r); + psize = rman_get_size(r); + poffs = paddr - trunc_page(paddr); + vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; - vaddr = (void *)MIPS_PHYS_TO_KSEG1((intptr_t)rman_get_start(r)); rman_set_virtual(r, vaddr); rman_set_bustag(r, MIPS_BUS_SPACE_MEM); #ifdef TARGET_OCTEON From owner-p4-projects@FreeBSD.ORG Sat Apr 12 17:07:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 248F2106568A; Sat, 12 Apr 2008 17:07:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF042106566C for ; Sat, 12 Apr 2008 17:07:48 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A12DF8FC29 for ; Sat, 12 Apr 2008 17:07:48 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CH7mWw094656 for ; Sat, 12 Apr 2008 17:07:48 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CH7mJI094654 for perforce@freebsd.org; Sat, 12 Apr 2008 17:07:48 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 12 Apr 2008 17:07:48 GMT Message-Id: <200804121707.m3CH7mJI094654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 139914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 17:07:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=139914 Change 139914 by gonzo@gonzo_jeeves on 2008/04/12 17:07:10 o Use paramteres passed from RB532 loader to set memory size properly. o Add TODO entry for platform_reset. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idt_machdep.c#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idt_machdep.c#5 (text+ko) ==== @@ -88,6 +88,11 @@ platform_reset(void) { volatile unsigned int * p = (void *)0xb8008000; + /* + * TODO: we should take care of TLB stuff here. Otherwise + * board does not boots properly next time + */ + /* Write 0x8000_0001 to the Reset register */ *p = 0x80000001; @@ -108,19 +113,36 @@ } void -platform_start(__register_t a0 __unused, __register_t a1 __unused, +platform_start(__register_t a0, __register_t a1, __register_t a2 __unused, __register_t a3 __unused) { uint64_t platform_counter_freq; vm_offset_t kernend; - int i; + int argc = a0; + char **argv = (char **)a1; + int i, mem; + /* clear the BSS and SBSS segments */ kernend = round_page((vm_offset_t)&end); memset(&edata, 0, kernend - (vm_offset_t)(&edata)); + /* + * Looking for mem=XXM argument + */ + mem = 0; /* Just something to start with */ + for (i=0; i < argc; i++) { + if (strncmp(argv[i], "mem=", 4) == 0) { + mem = strtol(argv[i] + 4, NULL, 0); + break; + } + } + bootverbose = 1; - realmem = btoc(32 << 20); + if (mem > 0) + realmem = btoc(mem << 20); + else + realmem = btoc(32 << 20); for (i = 0; i < 10; i++) { phys_avail[i] = 0; @@ -142,6 +164,14 @@ platform_counter_freq = 330000000UL; mips_timer_init_params(platform_counter_freq, 1); cninit(); + /* Panic here, after cninit */ + if (mem == 0) + panic("No mem=XX parameter in arguments"); + + printf("cmd line: "); + for (i=0; i < argc; i++) + printf("%s ", argv[i]); + printf("\n"); init_param2(physmem); mips_cpu_init(); From owner-p4-projects@FreeBSD.ORG Sat Apr 12 17:21:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01113106567A; Sat, 12 Apr 2008 17:21:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 834C1106566C for ; Sat, 12 Apr 2008 17:21:03 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 63E818FC16 for ; Sat, 12 Apr 2008 17:21:03 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CHL39d095156 for ; Sat, 12 Apr 2008 17:21:03 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CHL3hm095154 for perforce@freebsd.org; Sat, 12 Apr 2008 17:21:03 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 12 Apr 2008 17:21:03 GMT Message-Id: <200804121721.m3CHL3hm095154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 139917 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 17:21:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=139917 Change 139917 by gonzo@gonzo_jeeves on 2008/04/12 17:20:51 o There is no difference for MIPS between IOPORT and MEM resources. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#8 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#8 (text+ko) ==== @@ -367,7 +367,7 @@ * If this is a memory resource, track the direct mapping * in the uncached MIPS KSEG1 segment. */ - if (type == SYS_RES_MEMORY) { + if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) { caddr_t vaddr = 0; u_int32_t paddr; u_int32_t psize; From owner-p4-projects@FreeBSD.ORG Sat Apr 12 17:25:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 580EC1065673; Sat, 12 Apr 2008 17:25:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AAA4106564A for ; Sat, 12 Apr 2008 17:25:08 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D53858FC1F for ; Sat, 12 Apr 2008 17:25:07 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CHP7ag095291 for ; Sat, 12 Apr 2008 17:25:07 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CHP7XS095289 for perforce@freebsd.org; Sat, 12 Apr 2008 17:25:07 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 12 Apr 2008 17:25:07 GMT Message-Id: <200804121725.m3CHP7XS095289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 139918 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 17:25:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=139918 Change 139918 by gonzo@gonzo_jeeves on 2008/04/12 17:24:16 o Remove commented out setup_intr function o Use bus_generic_activate_../bus_generic_deactivate_... we have nothing to do with resources on this level: IRQ are handled by OBIO and MEM/IOPORT by nexus device. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idtpci.c#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idtpci.c#4 (text+ko) ==== @@ -478,7 +478,6 @@ struct idtpci_softc *sc = device_get_softc(bus); struct resource *rv = NULL; struct rman *rm1, *rm2; - void *vaddr; switch (type) { case SYS_RES_IRQ: @@ -507,13 +506,6 @@ if (rv == NULL) return (NULL); - if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) { - vaddr = - (void *)MIPS_PHYS_TO_KSEG1((intptr_t)rman_get_start(rv)); - rman_set_virtual(rv, vaddr); - rman_set_bushandle(rv, (bus_space_handle_t)vaddr); - } - rman_set_rid(rv, *rid); if (flags & RF_ACTIVE) { @@ -527,54 +519,6 @@ } static int -idtpci_activate_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) -{ - if (type == SYS_RES_IRQ) { - /* TODO:enable interrupt here? */ - } - - return (rman_activate_resource(r)); -} - -#if 0 -static int -idtpci_setup_intr(device_t dev, device_t child, struct resource *ires, - int flags, driver_filter_t *filt, driver_intr_t *handler, - void *arg, void **cookiep) -{ - panic("setup_intr"); - struct idtpci_softc *sc = device_get_softc(dev); - struct intr_event *event; - int irq, error; - - irq = rman_get_start(ires); - if (irq >= ICU_LEN || irq == 2) - panic("%s: bad irq or type", __func__); - - event = sc->sc_eventstab[irq]; - if (event == NULL) { - error = intr_event_create(&event, (void *)irq, 0, - (void (*)(void *))NULL, "idtpci intr%d:", irq); - if (error) - return 0; - sc->sc_eventstab[irq] = event; - } - - intr_event_add_handler(event, device_get_nameunit(child), filt, - handler, arg, intr_priority(flags), flags, cookiep); - - /* Enable it, set trigger mode. */ - sc->sc_imask &= ~(1 << irq); - sc->sc_elcr &= ~(1 << irq); - - idtpci_set_icus(sc); - - return (0); -} -#endif - -static int idtpci_teardown_intr(device_t dev, device_t child, struct resource *res, void *cookie) { @@ -596,7 +540,7 @@ DEVMETHOD(bus_write_ivar, idtpci_write_ivar), DEVMETHOD(bus_alloc_resource, idtpci_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), - DEVMETHOD(bus_activate_resource, idtpci_activate_resource), + DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, idtpci_teardown_intr), From owner-p4-projects@FreeBSD.ORG Sat Apr 12 17:43:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EA961065671; Sat, 12 Apr 2008 17:43:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20D39106564A for ; Sat, 12 Apr 2008 17:43:27 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F27D18FC12 for ; Sat, 12 Apr 2008 17:43:26 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CHhQCO095908 for ; Sat, 12 Apr 2008 17:43:26 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CHhQIE095906 for perforce@freebsd.org; Sat, 12 Apr 2008 17:43:26 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 12 Apr 2008 17:43:26 GMT Message-Id: <200804121743.m3CHhQIE095906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 139921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 17:43:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=139921 Change 139921 by gonzo@gonzo_jeeves on 2008/04/12 17:42:32 o We can share interrupts, so don't panic if there are several requests for the same IRQ. o Implement PIC-specific mask/unmask functions intead of generic stubs. o New IRQ handling logic: take into account FILTER_SCHEDULE_THREAD, reset thread flag before handling new IRQ. o Do not map MEM/IOPORT resources on this level - it's up to nexus device. o Minor style(9) fixes Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/obio.c#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/obio.c#3 (text+ko) ==== @@ -76,6 +76,30 @@ static int obio_teardown_intr(device_t, device_t, struct resource *, void *); +static void obio_mask_irq(unsigned int irq) +{ + int ip_bit, mask, mask_register; + + /* mask IRQ */ + mask_register = ICU_IRQ_MASK_REG(irq); + ip_bit = ICU_IP_BIT(irq); + + mask = ICU_REG_READ(mask_register); + ICU_REG_WRITE(mask_register, mask | ip_bit); +} + +static void obio_unmask_irq(unsigned int irq) +{ + int ip_bit, mask, mask_register; + + /* unmask IRQ */ + mask_register = ICU_IRQ_MASK_REG(irq); + ip_bit = ICU_IP_BIT(irq); + + mask = ICU_REG_READ(mask_register); + ICU_REG_WRITE(mask_register, mask & ~ip_bit); +} + static int obio_probe(device_t dev) { @@ -199,20 +223,9 @@ struct resource *r) { - /* - * If this is a memory resource, track the direct mapping - * in the uncached MIPS KSEG1 segment. - */ - if (type == SYS_RES_MEMORY) { - void *vaddr; - - vaddr = (void *)MIPS_PHYS_TO_KSEG1((intptr_t)rman_get_start(r)); - rman_set_virtual(r, vaddr); - rman_set_bustag(r, MIPS_BUS_SPACE_MEM); - rman_set_bushandle(r, (bus_space_handle_t)vaddr); - } - - return (rman_activate_resource(r)); + /* XXX: should we mask/unmask IRQ here? */ + return (BUS_ACTIVATE_RESOURCE(device_get_parent(bus), child, + type, rid, r)); } static int @@ -220,7 +233,9 @@ struct resource *r) { - return (rman_deactivate_resource(r)); + /* XXX: should we mask/unmask IRQ here? */ + return (BUS_DEACTIVATE_RESOURCE(device_get_parent(bus), child, + type, rid, r)); } static int @@ -259,14 +274,12 @@ event = sc->sc_eventstab[irq]; if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, - (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, + (mask_fn)obio_mask_irq, (mask_fn)obio_unmask_irq, NULL, NULL, "obio intr%d:", irq); sc->sc_eventstab[irq] = event; } - else - panic("obio: Can't share IRQs"); intr_event_add_handler(event, device_get_nameunit(child), filt, handler, arg, intr_priority(flags), flags, cookiep); @@ -304,9 +317,8 @@ ICU_REG_WRITE(mask_register, mask | ip_bit); result = intr_event_remove_handler(cookie); - if (!result) { + if (!result) sc->sc_eventstab[irq] = NULL; - } return (result); } @@ -318,9 +330,8 @@ struct intr_event *event; struct intr_handler *ih; uint32_t irqstat, ipend, imask, xpend; - int irq, thread = 0, group, i; + int irq, thread, group, i, ret; - /* TODO: handle all IRQs */ irqstat = 0; irq = 0; for (group = 2; group <= 6; group++) { @@ -328,6 +339,7 @@ imask = ICU_REG_READ(ICU_GROUP_MASK_REG(group)); xpend = ipend; ipend &= ~imask; + while ((i = fls(xpend)) != 0) { xpend &= ~(1 << (i - 1)); irq = IP_IRQ(group, i - 1); @@ -337,23 +349,48 @@ ipend &= ~(1 << (i - 1)); irq = IP_IRQ(group, i - 1); event = sc->sc_eventstab[irq]; - if (event && !TAILQ_EMPTY(&event->ie_handlers)) { - /* Execute fast handlers. */ - TAILQ_FOREACH(ih, &event->ie_handlers, - ih_next) { - if (ih->ih_filter == NULL) + thread = 0; +#ifndef INTR_FILTER + obio_mask_irq(irq); +#endif + if (!event || TAILQ_EMPTY(&event->ie_handlers)) { +#ifdef INTR_FILTER + obio_unmask_irq(irq); +#endif + continue; + } + +#ifdef INTR_FILTER + /* TODO: frame instead of NULL? */ + intr_event_handle(event, NULL); + /* XXX: Log stray IRQs */ +#else + /* Execute fast handlers. */ + TAILQ_FOREACH(ih, &event->ie_handlers, + ih_next) { + if (ih->ih_filter == NULL) + thread = 1; + else + ret = ih->ih_filter(ih->ih_argument); + /* + * Wrapper handler special case: see + * intr_execute_handlers() in + * i386/intr_machdep.c + */ + if (!thread) { + if (ret == FILTER_SCHEDULE_THREAD) thread = 1; - else - ih->ih_filter(ih->ih_argument); } } /* Schedule thread if needed. */ if (thread) intr_event_schedule_thread(event); - + else + obio_unmask_irq(irq); } } +#endif #if 0 ipend = ICU_REG_READ(ICU_IPEND2); printf("ipend2 = %08x!\n", ipend); From owner-p4-projects@FreeBSD.ORG Sat Apr 12 17:51:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D62161065674; Sat, 12 Apr 2008 17:51:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66B4D1065671 for ; Sat, 12 Apr 2008 17:51:36 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A9308FC22 for ; Sat, 12 Apr 2008 17:51:36 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CHpaCm096200 for ; Sat, 12 Apr 2008 17:51:36 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CHpZ8W096198 for perforce@freebsd.org; Sat, 12 Apr 2008 17:51:35 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 12 Apr 2008 17:51:35 GMT Message-Id: <200804121751.m3CHpZ8W096198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 139923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 17:51:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=139923 Change 139923 by gonzo@gonzo_jeeves on 2008/04/12 17:50:59 o Define __PCI_REROUTE_INTERRUPT for mips. RB532 PCI registers contain junk values for interrupts, so pre-route interrupts to prevent bad parameters in bus_alloc_resource. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#8 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#8 (text+ko) ==== @@ -51,6 +51,8 @@ #endif #endif +#define __PCI_REROUTE_INTERRUPT + #ifndef MACHINE #define MACHINE "mips" #endif From owner-p4-projects@FreeBSD.ORG Sat Apr 12 17:54:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5C01106566C; Sat, 12 Apr 2008 17:54:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 984DB1065675 for ; Sat, 12 Apr 2008 17:54:40 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 754F48FC2B for ; Sat, 12 Apr 2008 17:54:40 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CHseVv096242 for ; Sat, 12 Apr 2008 17:54:40 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CHseN5096240 for perforce@freebsd.org; Sat, 12 Apr 2008 17:54:40 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 12 Apr 2008 17:54:40 GMT Message-Id: <200804121754.m3CHseN5096240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 139924 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 17:54:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=139924 Change 139924 by gonzo@gonzo_jeeves on 2008/04/12 17:54:21 o Remove dummy option ROOTDEVNAME o Add wlan(4) and ath(4) devices Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/conf/IDT#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/conf/IDT#2 (text+ko) ==== @@ -4,8 +4,6 @@ cpu CPU_MIPS4KC ident RB532 -makeoptions MIPS_LITTLE_ENDIAN=defined - # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" @@ -29,9 +27,6 @@ options BOOTP_WIRED_TO=kr0 options BOOTP_COMPAT -options ROOTDEVNAME=\"nfs:192.168.0.52:/mnt/bsd\" - - # Debugging for use in -current options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS @@ -48,11 +43,12 @@ device md # Wireless NIC cards -#device wlan # 802.11 support -#device wlan_wep # 802.11 WEP support -#device wlan_ccmp # 802.11 CCMP support -#device wlan_tkip # 802.11 TKIP support -#device ath # Atheros pci/cardbus NIC's -#device ath_hal # Atheros HAL (Hardware Access Layer) -#device ath_rate_sample # SampleRate tx rate control for ath -#options ATH_DEBUG +device wlan # 802.11 support +device wlan_wep # 802.11 WEP support +device wlan_tkip # 802.11 TKIP support +device wlan_scan_ap #802.11 AP mode scanning +device wlan_scan_sta #802.11 STA mode scanning +device ath # Atheros pci/cardbus NIC's +device ath_hal # Atheros HAL (Hardware Access Layer) +device ath_rate_sample # SampleRate tx rate control for ath +options ATH_DEBUG From owner-p4-projects@FreeBSD.ORG Sat Apr 12 20:17:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCA311065671; Sat, 12 Apr 2008 20:17:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D8F3106564A for ; Sat, 12 Apr 2008 20:17:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6DCB08FC13 for ; Sat, 12 Apr 2008 20:17:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CKHC3a005576 for ; Sat, 12 Apr 2008 20:17:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CKHCON005574 for perforce@freebsd.org; Sat, 12 Apr 2008 20:17:12 GMT (envelope-from imp@freebsd.org) Date: Sat, 12 Apr 2008 20:17:12 GMT Message-Id: <200804122017.m3CKHCON005574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 139929 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 20:17:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=139929 Change 139929 by imp@imp_lighthouse on 2008/04/12 20:16:21 Move from sgi mips stuff to trad mips stuff. The formats are nearly identical, but tradmips is what Linux, NetBSD and OpenBSD all use. This also adds support to generate n32 and 64 (aka n64) ABI binaries, but there's a lot of work needed to make these work (including some kernel work). Binaries generated with the 32 ABI (aka o32) seem to work. Hopefully, this won't reveal other, nastier bugs like the "second identical string" bug we hit in gas a while back. Affected files ... .. //depot/projects/mips2-jnpr/src/contrib/binutils/bfd/config.bfd#2 edit .. //depot/projects/mips2-jnpr/src/contrib/binutils/ld/emulparams/elf32bmip.sh#2 edit .. //depot/projects/mips2-jnpr/src/contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh#1 add .. //depot/projects/mips2-jnpr/src/contrib/binutils/ld/emulparams/elf32bmipn32.sh#2 edit .. //depot/projects/mips2-jnpr/src/contrib/binutils/ld/emulparams/elf32btsmip.sh#1 add .. //depot/projects/mips2-jnpr/src/contrib/binutils/ld/emulparams/elf32btsmipn32.sh#1 add .. //depot/projects/mips2-jnpr/src/contrib/binutils/ld/emulparams/elf32ltsmip.sh#1 add .. //depot/projects/mips2-jnpr/src/contrib/binutils/ld/emulparams/elf32ltsmipn32.sh#1 add .. //depot/projects/mips2-jnpr/src/contrib/binutils/ld/emulparams/elf64btsmip.sh#1 add .. //depot/projects/mips2-jnpr/src/contrib/binutils/ld/emulparams/elf64ltsmip.sh#1 add .. //depot/projects/mips2-jnpr/src/contrib/gcc/config/mips/freebsd.h#2 edit .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#2 edit .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h#2 edit .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/Makefile.arm#2 edit .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/Makefile.mips#2 edit .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh#1 add .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh#1 add .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh#1 add .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh#1 add .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/ldgram.c#1 add .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/ldgram.h#1 add .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/libbfd/Makefile.mips#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/contrib/binutils/bfd/config.bfd#2 (text+ko) ==== @@ -769,8 +769,8 @@ targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec" ;; mips*-*-freebsd*) - targ_defvec=bfd_elf32_bigmips_vec - targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec" + targ_defvec=bfd_elf32_tradbigmips_vec + targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" ;; mips*-*-netbsd*) targ_defvec=bfd_elf32_bigmips_vec ==== //depot/projects/mips2-jnpr/src/contrib/binutils/ld/emulparams/elf32bmip.sh#2 (text+ko) ==== @@ -10,6 +10,7 @@ MAXPAGESIZE=0x40000 COMMONPAGESIZE=0x1000 NONPAGED_TEXT_START_ADDR=0x0400000 +SHLIB_TEXT_START_ADDR=0x5ffe0000 test -n "${EMBEDDED}" || TEXT_DYNAMIC= INITIAL_READONLY_SECTIONS=" .reginfo ${RELOCATING-0} : { *(.reginfo) } ==== //depot/projects/mips2-jnpr/src/contrib/binutils/ld/emulparams/elf32bmipn32.sh#2 (text+ko) ==== @@ -2,6 +2,7 @@ OUTPUT_FORMAT="elf32-nbigmips" BIG_OUTPUT_FORMAT="elf32-nbigmips" LITTLE_OUTPUT_FORMAT="elf32-nlittlemips" +SHLIB_TEXT_START_ADDR=0x5ffe0000 COMMONPAGESIZE=0x1000 # IRIX6 defines these symbols. 0x34 is the size of the ELF header. ==== //depot/projects/mips2-jnpr/src/contrib/gcc/config/mips/freebsd.h#2 (text+ko) ==== @@ -33,6 +33,8 @@ #define MACHINE_TYPE "FreeBSD/mipsel ELF" #endif +#define MIPS_ABI_DEFAUL ABI_32 + #ifdef LIB_SPEC #undef LIB_SPEC #define LIB_SPEC FBSD_LIB_SPEC ==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#2 (text+ko) ==== @@ -15,3 +15,5 @@ /* Allow use of E_MIPS_ABI_O32 on MIPS targets. */ #define USE_E_MIPS_ABI_O32 1 +/* Use traditional mips */ +#define TE_TMIPS 1 ==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h#2 (text+ko) ==== @@ -1,2 +1,4 @@ /* $FreeBSD$ */ +#define TE_TMIPS 1 + #include "tc-mips.h" ==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/Makefile.arm#2 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.3 2006/09/14 07:44:05 imp Exp $ +# xxxIMPxxx: should use arm and armeb for this, ala netbsd. .if defined(TARGET_BIG_ENDIAN) NATIVE_EMULATION= armelfb_fbsd .else ==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/Makefile.mips#2 (text+ko) ==== @@ -1,14 +1,24 @@ # $FreeBSD$ -NATIVE_EMULATION= elf32bmip_fbsd +#xxxIMPxxx: size? +#xxxIMPxxx: TARGET_BIG_ENDIAN is lame. We should use the netbsd convention +# of mipsel and mips. +_sz?=32 +.if defined(TARGET_BIG_ENDIAN) +NATIVE_EMULATION=elf${_sz}btsmip_fbsd +.else +NATIVE_EMULATION=elf${_sz}ltsmip_fbsd +.endif SRCS+= e${NATIVE_EMULATION}.c CLEANFILES+= e${NATIVE_EMULATION}.c -e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \ +# nb: elf32 handles both elf32 and elf64 targets +e${NATIVE_EMULATION}.c: ${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \ scripttempl/elf.sc genscripts.sh stringify.sed sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ ${TOOLS_PREFIX}/usr \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} + ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} \ + ${.CURDIR}/${NATIVE_EMULATION}.sh ==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/libbfd/Makefile.mips#3 (text+ko) ==== @@ -1,6 +1,7 @@ # $FreeBSD$ -DEFAULT_VECTOR= bfd_elf32_bigmips_vec +#xxxIMPxxx: endian and size +DEFAULT_VECTOR= bfd_elf32_tradbigmips_vec SRCS+= coff-mips.c \ cpu-mips.c \ @@ -8,6 +9,7 @@ ecofflink.c \ elf32.c \ elf64.c \ + elfn32-mips.c \ elf32-mips.c \ elf64-mips.c \ elfxx-mips.c \ @@ -15,7 +17,11 @@ elf64-target.h \ elflink.c -VECS= ${DEFAULT_VECTOR} \ - bfd_elf32_littlemips_vec \ - bfd_elf64_bigmips_vec \ - bfd_elf64_littlemips_vec +VECS= bfd_elf32_tradbigmips_vec \ + bfd_elf32_tradlittlemips_vec \ + bfd_elf32_ntradbigmips_vec \ + bfd_elf32_ntradlittlemips_vec \ + bfd_elf64_tradbigmips_vec \ + bfd_elf64_tradlittlemips_vec \ + ecoff_little_vec \ + ecoff_big_vec From owner-p4-projects@FreeBSD.ORG Sat Apr 12 21:31:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E63121065671; Sat, 12 Apr 2008 21:31:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7D49106566C for ; Sat, 12 Apr 2008 21:31:31 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F6EC8FC18 for ; Sat, 12 Apr 2008 21:31:31 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CLVVVA018490 for ; Sat, 12 Apr 2008 21:31:31 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CLVV0r018488 for perforce@freebsd.org; Sat, 12 Apr 2008 21:31:31 GMT (envelope-from qingli@freebsd.org) Date: Sat, 12 Apr 2008 21:31:31 GMT Message-Id: <200804122131.m3CLVV0r018488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 139936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 21:31:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=139936 Change 139936 by qingli@FreeBSD-newarp on 2008/04/12 21:30:34 Take care of address aliases when an interface route has the interface address that is at the top of the address list. Also cleaned up code according to code reviews. Affected files ... .. //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#4 edit .. //depot/projects/qingli_mpath/src/sys/net/radix_mpath.h#3 edit .. //depot/projects/qingli_mpath/src/sys/net/route.c#5 edit Differences ... ==== //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#4 (text+ko) ==== @@ -52,16 +52,14 @@ static u_int32_t hashjitter; int -rn_mpath_capable(rnh) - struct radix_node_head *rnh; +rn_mpath_capable(struct radix_node_head *rnh) { return rnh->rnh_multipath; } struct radix_node * -rn_mpath_next(rn) - struct radix_node *rn; +rn_mpath_next(struct radix_node *rn) { struct radix_node *next; @@ -75,8 +73,7 @@ } int -rn_mpath_count(rn) - struct radix_node *rn; +rn_mpath_count(struct radix_node *rn) { int i; @@ -87,9 +84,7 @@ } struct rtentry * -rt_mpath_matchgate(rt, gate) - struct rtentry *rt; - struct sockaddr *gate; +rt_mpath_matchgate(struct rtentry *rt, struct sockaddr *gate) { struct radix_node *rn; @@ -103,7 +98,7 @@ rn = (struct radix_node *)rt; do { rt = (struct rtentry *)rn; - /* qingli: + /* * we are removing an address alias that has * the same prefix as another address * we need to compare the interface address because @@ -118,20 +113,16 @@ break; } } while ((rn = rn_mpath_next(rn)) != NULL); - if (!rn) - return NULL; return (struct rtentry *)rn; } -/* qingli: +/* * go through the chain and unlink "rt" from the list * the caller will free "rt" */ int -rt_mpath_deldup(headrt, rt) - struct rtentry *headrt; - struct rtentry *rt; +rt_mpath_deldup(struct rtentry *headrt, struct rtentry *rt) { struct radix_node *t, *tt; @@ -157,10 +148,8 @@ * check if we have the same key/mask/gateway on the table already. */ int -rt_mpath_conflict(rnh, rt, netmask) - struct radix_node_head *rnh; - struct rtentry *rt; - struct sockaddr *netmask; +rt_mpath_conflict(struct radix_node_head *rnh, struct rtentry *rt, + struct sockaddr *netmask) { struct radix_node *rn, *rn1; struct rtentry *rt1; @@ -262,9 +251,7 @@ } void -rtalloc_mpath(ro, hash) - struct route *ro; - int hash; +rtalloc_mpath(struct route *ro, int hash) { struct radix_node *rn0, *rn; int n; @@ -312,13 +299,11 @@ RT_UNLOCK(ro->ro_rt); } -extern int in6_inithead __P((void **head, int off)); -extern int in_inithead __P((void **head, int off)); +extern int in6_inithead(void **head, int off); +extern int in_inithead(void **head, int off); int -rn4_mpath_inithead(head, off) - void **head; - int off; +rn4_mpath_inithead(void **head, int off) { struct radix_node_head *rnh; @@ -332,9 +317,7 @@ } int -rn6_mpath_inithead(head, off) - void **head; - int off; +rn6_mpath_inithead(void **head, int off) { struct radix_node_head *rnh; ==== //depot/projects/qingli_mpath/src/sys/net/radix_mpath.h#3 (text+ko) ==== @@ -43,22 +43,18 @@ struct route; struct rtentry; struct sockaddr; -int rn_mpath_capable __P((struct radix_node_head *)); -struct radix_node *rn_mpath_next __P((struct radix_node *)); -int rn_mpath_count __P((struct radix_node *)); -struct rtentry *rt_mpath_matchgate __P((struct rtentry *, struct sockaddr *)); -int rt_mpath_conflict __P((struct radix_node_head *, struct rtentry *, - struct sockaddr *)); -void rtalloc_mpath __P((struct route *, int)); -struct radix_node *rn_mpath_lookup __P((void *, void *, - struct radix_node_head *)); -int rt_mpath_deldup __P((struct rtentry *, struct rtentry *)); -int rn4_mpath_inithead __P((void **, int)); -int rn6_mpath_inithead __P((void **, int)); - -/* for compatibility with NetBSD */ -#define rn_p rn_parent -#define rn_b rn_bit +int rn_mpath_capable(struct radix_node_head *); +struct radix_node *rn_mpath_next(struct radix_node *); +int rn_mpath_count(struct radix_node *); +struct rtentry *rt_mpath_matchgate(struct rtentry *, struct sockaddr *); +int rt_mpath_conflict(struct radix_node_head *, struct rtentry *, + struct sockaddr *); +void rtalloc_mpath(struct route *, int); +struct radix_node *rn_mpath_lookup(void *, void *, + struct radix_node_head *); +int rt_mpath_deldup(struct rtentry *, struct rtentry *); +int rn4_mpath_inithead(void **, int); +int rn6_mpath_inithead(void **, int); #endif ==== //depot/projects/qingli_mpath/src/sys/net/route.c#5 (text+ko) ==== @@ -735,10 +735,12 @@ RT_UNLOCK(rto); } else if (rt->rt_flags & RTF_GATEWAY) { /* - * For gateway routes, we need to make sure that we - * we are deleting the correct gateway. - * rt_mpath_matchgate() does not check the case when - * there is only one route in the chain. + * For gateway routes, we need to + * make sure that we we are deleting + * the correct gateway. + * rt_mpath_matchgate() does not + * check the case when there is only + * one route in the chain. */ if (gateway && (rt->rt_gateway->sa_len != gateway->sa_len || @@ -1298,9 +1300,10 @@ else { rt = RNTORT(rn); /* - * for interface route the rt->rt_gateway is sockaddr_intf - * for cloning ARP entries, so rt_mpath_matchgate - * must use the interface address + * for interface route the rt->rt_gateway is + * sockaddr_intf for cloning ARP entries, so + * rt_mpath_matchgate must use the interface + * address */ rt = rt_mpath_matchgate(rt, ifa->ifa_addr); if (!rt) @@ -1337,6 +1340,21 @@ * notify any listening routing agents of the change */ RT_LOCK(rt); +#ifdef RADIX_MPATH + /* + * in case address alias finds the first address + * e.g. ifconfig bge0 192.103.54.246/24 + * e.g. ifconfig bge0 192.103.54.247/24 + * the address set in the route is 192.103.54.246 + * so we need to replace it with 192.103.54.247 + */ + if (memcmp(rt->rt_ifa->ifa_addr, ifa->ifa_addr, ifa->ifa_addr->sa_len)) { + IFAFREE(rt->rt_ifa); + IFAREF(ifa); + rt->rt_ifp = ifa->ifa_ifp; + rt->rt_ifa = ifa; + } +#endif rt_newaddrmsg(cmd, ifa, error, rt); if (cmd == RTM_DELETE) { /* From owner-p4-projects@FreeBSD.ORG Sat Apr 12 21:42:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9537106568C; Sat, 12 Apr 2008 21:42:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 786CB1065673 for ; Sat, 12 Apr 2008 21:42:43 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 526F78FC1A for ; Sat, 12 Apr 2008 21:42:43 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CLghpH018848 for ; Sat, 12 Apr 2008 21:42:43 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CLghGY018846 for perforce@freebsd.org; Sat, 12 Apr 2008 21:42:43 GMT (envelope-from qingli@freebsd.org) Date: Sat, 12 Apr 2008 21:42:43 GMT Message-Id: <200804122142.m3CLghGY018846@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 139938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 21:42:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=139938 Change 139938 by qingli@FreeBSD-newarp on 2008/04/12 21:42:35 a couple more spot cleanup Affected files ... .. //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#5 edit Differences ... ==== //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#5 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include #include -#define M_DONTWAIT M_NOWAIT #include #include #include @@ -220,7 +219,7 @@ goto different; } - maskmatched:; + maskmatched: /* key/mask were the same. compare gateway for all multipaths */ do { From owner-p4-projects@FreeBSD.ORG Sat Apr 12 21:44:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18CF21065676; Sat, 12 Apr 2008 21:44:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6A80106564A for ; Sat, 12 Apr 2008 21:44:49 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 902138FC21 for ; Sat, 12 Apr 2008 21:44:49 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CLinZJ018941 for ; Sat, 12 Apr 2008 21:44:49 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CLilFc018939 for perforce@freebsd.org; Sat, 12 Apr 2008 21:44:47 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 12 Apr 2008 21:44:47 GMT Message-Id: <200804122144.m3CLilFc018939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139939 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 21:44:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=139939 Change 139939 by pgj@disznohal on 2008/04/12 21:44:28 Add initial Hungarian translation of FreeBSD Glossary. Affected files ... .. //depot/projects/docproj_hu/share/sgml/glossary/freebsd-glossary.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/share/sgml/glossary/freebsd-glossary.sgml#2 (text+ko) ==== @@ -30,11 +30,18 @@ the main text. --> + - - &os; Glossary - This glossary contains terms and acronyms used within the &os; - community and documentation. + + A &os;-s szakkifejezések gyûjteménye + + Ebben a szójegyzékben azok a fogalmak és + rövidítések szerepelnek, amelyekkel a &os;-s + közösségen belül és a + hozzátartozó különbözõ + leírásokban találkozhatunk. A @@ -98,10 +105,14 @@ ACPI Machine Language AML - Pseudocode, interpreted by a virtual machine within an - ACPI-compliant operating system, providing a - layer between the underlying hardware and the documented - interface presented to the OS. + Olyan pszeudókód, amit egy + ACPI szabvánnyal kompatibilis + operációs rendszerben megtalálható + virtuális géppel lehet értelmezni. + Feladata a rendelkezésre álló hardveren + az operációs rendszer felé + dokumentált felület + kialakítása. @@ -109,7 +120,9 @@ ACPI Source Language ASL - The programming language AML is written in. + Az a programozási nyelv, amiben az + AML-kódok + íródnak. @@ -117,7 +130,7 @@ Access Control List ACL - + @@ -125,14 +138,25 @@ Advanced Configuration and Power Interface ACPI - A specification which provides an abstraction of the - interface the hardware presents to the operating system, so - that the operating system should need to know nothing about - the underlying hardware to make the most of it. ACPI - evolves and supercedes the functionality provided previously by - APM, PNPBIOS and other technologies, and - provides facilities for controlling power consumption, machine - suspension, device enabling and disabling, etc. + Az a specifikáció, aminek + köszönhetõen a hardver egy absztrakt + felületet képes nyújtani az + operációs rendszer számára. Ezen + a felületen keresztül tudja az + operációs rendszer elérni a + rendelkezésre álló hardvert annak + konkrét ismerete nélkül. Az + ACPI a korábban az + APM, PNPBIOS és a + hozzájuk hasonló megoldások által + szolgáltatott lehetõségeket igyekszik + kiterjeszteni és felülmúlni. Ennek + keretében lehetõséget ad többek + közt az energiafogyasztás + szabályozására, az energiatakarés + mód aktiválására, az + eszközök ki- és bekapcsolására + stb. @@ -140,10 +164,14 @@ Application Programming Interface API - A set of procedures, protocols and tools that specify the - canonical interaction of one or more program parts; how, when - and why they do work together, and what data they share or - operate on. + Eljárások, protokollok és + segédprogramok összesége, melyek egy vagy + több programrész között + írják le az általános + összefüggéseket: hogyan, mikor és + miért kell összedolgozniuk, illetve milyen + adatokat osszanak meg egymás között vagy + milyen adatokkal dolgozzanak. @@ -151,7 +179,7 @@ Advanced Power Management APM - + @@ -159,7 +187,7 @@ Advanced Programmable Interrupt Controller APIC - + @@ -167,7 +195,7 @@ Advanced Technology Attachment ATA - + @@ -175,7 +203,7 @@ Asynchronous Transfer Mode ATM - + @@ -183,7 +211,7 @@ Authenticated Post Office Protocol APOP - + @@ -191,8 +219,10 @@ Automatic Mount Daemon AMD - A daemon that automatically mounts a filesystem when a file - or directory within that filesystem is accessed. + Egy olyan démon, ami önmûködõen + csatlakoztatja az állományrendszereket, amikor + azokon valamilyen állományt vagy + könyvtárat el akarunk érni. @@ -224,8 +254,9 @@ Base Address Register BAR - The registers that determine which address range a PCI device - will respond to. + Egy PCI eszköz címtartományának + megadásáért felelõs + regiszterek. @@ -233,14 +264,21 @@ Basic Input/Output System BIOS - The definition of BIOS depends a bit on - the context. Some people refer to it as the ROM - chip with a basic set of routines to provide an interface between - software and hardware. Others refer to it as the set of routines - contained in the chip that help in bootstrapping the system. Some - might also refer to it as the screen used to configure the - boostrapping process. The BIOS is PC-specific - but other systems have something similar. + A BIOS meghatározása + némileg a környezetétõl is függ. + Egyesek szerint BIOS az a + ROM chip, ami a szoftver és hardver + közti kapcsolatot megteremtõ alapvetõ rutinokat + tartalmazza. Mások szerint viszont azok a chipen + tárolt rutinok, amelyek a rendszer + betöltéséért felelõsek. De + akadnak olyanok is, akik ilyenkor arra a + képernyõre gondolnak, amin a rendszer + betöltésének folymatát tudjuk + beállítani. Noha a BIOS + leginkább a PC típusú rendszerekre + jellemzõ, más esetekben is találkozhatunk + hasonlóval. @@ -248,7 +286,9 @@ Berkeley Internet Name Domain BIND - An implementation of the DNS protocols. + A névfeloldásért felelõs + DNS protokollok egyik + implementációja. @@ -256,23 +296,30 @@ Berkeley Software Distribution BSD - This is the name that the Computer Systems Research Group - (CSRG) at The University - of California at Berkeley - gave to their improvements and modifications to - AT&T's 32V &unix;. - &os; is a descendant of the CSRG work. + A Kaliforniai Egyetem + (Berkeley) számítógépes + rendszerekkel foglalkozó kutatócsoportja (CSRG) + ebben foglalta össze az AT&T 32V &unix; + rendszerén végzett változtatásait + és javításait. Maga a &os; is ennek az + egyik leszármazottja. Bikeshed Building - A phenomenon whereby many people will give an opinion on - an uncomplicated topic, whilst a complex topic receives little - or no discussion. See the - FAQ for - the origin of the term. + A bikeshed building, vagyis a + biciklitároló + építés az a jelenség, + amikor egy egyszerûbb témához mindenki + hozzá akar szólni, miközben egy sokkal + bonyolultabb témával alig vagy + egyáltalán nem foglalkoznak. Ennek + kialakulásáról részletesebben a + GYIK-ban + lehet olvasni. @@ -319,8 +366,9 @@ Carrier Detect CD - An RS232C signal indicating that a carrier - has been detected. + A kommunikációs csatorna + létrejöttét jelzõ + RS232C szabványú jel. @@ -328,11 +376,16 @@ Central Processing Unit CPU - Also known as the processor. This is the brain of the - computer where all calculations take place. There are a number of - different architectures with different instruction sets. Among - the more well-known are the Intel-x86 and derivatives, Sun SPARC, - PowerPC, and Alpha. + Másik nevén processzor. + Lényegében ez a + számítógép agya, ahol a + különféle számítások + történnek. Rengeteg különbözõ + architektúrája és + utasításkészlete lehet. + Közülük a legismertebbek az Intel x86 és + annak leszármazottai, valamint a Sun SPARC, PowerPC + és Alpha. @@ -340,7 +393,7 @@ Challenge Handshake Authentication Protocol CHAP - + @@ -348,7 +401,7 @@ Classical IP over ATM CLIP - + @@ -356,8 +409,9 @@ Clear To Send CTS - An RS232C signal giving the remote system - permission to send data. + A távoli rendszer számára a + küldést engedélyezõ + RS232C szabványú jel. @@ -365,7 +419,7 @@ Common Object File Format COFF - + @@ -373,11 +427,15 @@ Concurrent Versions System CVS - A version control system, providing a method of working with and - keeping track of many different revisions of files. CVS provides the - ability to extract, merge and revert individual changes or sets of - changes, and offers the ability to keep track of which changes were - made, by who and for what reason. + Egy verziókezelõ rendszer, aminek + használatával egyszerre több + változatot tudunk nyilvántartani és + használni adott állományokból. A + CVS segítségével képesek vagyunk + egy vagy több változtatást kivonni, + összefésülni és visszavonni, valamint + nyomon követhetjük, hogy melyiküket ki, mikor + és miért hajtotta végre. @@ -442,9 +500,10 @@ Data Encryption Standard DES - A method of encrypting information, traditionally used as the - method of encryption for &unix; passwords and the &man.crypt.3; - function. + Az információ + titkosítására szánt módszer, + amelyet általában a &unix;-os jelszavak és + &man.crypt.3; funkció használ. @@ -452,9 +511,12 @@ Data Set Ready DSR - An RS232C signal sent from the modem to the - computer or terminal indicating a readiness to send and receive - data. + Ezt az RS232C szabványú + jelet küldi egy modem a + számítógépünknek vagy a + terminálunknak, amikor készen áll az + adatok fogadására és + küldésére. @@ -462,9 +524,11 @@ Data Terminal Ready DTR - An RS232C signal sent from the computer or - terminal to the modem indicating a readiness to send and receive - data. + Ezt az RS232C szabványú + jelet küldi számítógépünk + vagy a terminálunk a modemnek, amikor készen + áll az adatok fogadására és + küldésére. @@ -472,9 +536,14 @@ Debugger DDB - An interactive in-kernel facility for examining the status of - a system, often used after a system has crashed to establish the - events surrounding the failure. + A rendszermagban megtalálható + interaktív nyomkövetési + lehetõség, amin keresztül meg tudjuk + vizsgálni rendszerünk aktuális + állapotát. Leggyakrabban a rendszer + összeomlásáért felelõs + körülmények elemzésében + alkalmazzák. @@ -482,7 +551,7 @@ Differentiated System Description Table DSDT - + @@ -490,7 +559,7 @@ Distance-Vector Multicast Routing Protocol DVMRP - + @@ -498,8 +567,11 @@ Domain Name System DNS - The system that converts humanly readable hostnames (i.e., - mail.example.net) to Internet addresses and vice versa. + Az internetes címek (pl. levelezes.valami.net) + emberek és gépek által is olvasható + formája közti + leképezéséért felelõs + rendszer. @@ -507,9 +579,12 @@ Dynamic Host Configuration Protocol DHCP - A protocol that dynamically assigns IP addresses to a computer - (host) when it requests one from the server. The address assignment - is called a lease. + A számítógépek + IP-címeinek szerveren keresztüli dinamikus + kiosztásáért felelõs protokoll. Az + így keletkezõ cím alapú + hozzárendelést bérletnek + (lease) nevezzük. @@ -536,7 +611,7 @@ Encapsulated Security Payload ESP - + @@ -544,7 +619,7 @@ Executable and Linking Format ELF - + @@ -552,7 +627,7 @@ Extended COFF ECOFF - + @@ -584,7 +659,7 @@ File Allocation Table FAT - + @@ -592,7 +667,7 @@ File Allocation Table (16-bit) FAT16 - + @@ -600,9 +675,12 @@ File Transfer Protocol FTP - A member of the family of high-level protocols implemented - on top of TCP which can be used to transfer - files over a TCP/IP network. + A TCP felett implementált + magasabb szintû protokollok családjának egyik + tagja, aminek segítségével + állományokat tudunk átmásolni egy + TCP/IP-hálózaton + keresztül. @@ -610,7 +688,7 @@ Fixed ACPI Description Table FADT - + @@ -625,25 +703,36 @@ Giant - The name of a mutual exclusion mechanism - (a sleep mutex) that protects a large - set of kernel resources. Although a simple locking mechanism - was adequate in the days where a machine might have only - a few dozen processes, one networking card, and certainly - only one processor, in current times it is an unacceptable - performance bottleneck. &os; developers are actively working - to replace it with locks that protect individual resources, - which will allow a much greater degree of parallelism for - both single-processor and multi-processor machines. + Annak a kölcsönös + kizárásért felelõs megoldásnak + (alvó (sleep) mutex-nek) a neve, ami a + rendszermag erõforrásainak jelentõs + részét védi. Amikor még a + számítógépek csupán + néhány programot futtattak egyetlen + hálózati kártyával és + általában egyetlen processzoron, akkor + még elegendõ volt egy egyszerûbb + zárolási mechanizmus használata, azonban + napjainkban ez már egy elfogadhatatlanul szûk + keresztmetszetet képez. A &os; fejlesztõi + folyamatosan dolgoznak, hogy ezt olyan + zárolásokkal váltsák fel, amelyek + csak az egyes erõforrásokat védik. Ennek + köszönhetõen sokkal nagyobb fokú + párhuzamosítás érthetõ el + mind az egyprocesszoros mind pedig a többprocesszoros + rendszerekben egyaránt. - + Graphical User Interface GUI - A system where the user and computer interact with - graphics. + Olyan rendszer, ahol a felhasználó és + a számítógép grafikus + megoldásokon keresztül érintkezik. @@ -665,7 +754,7 @@ HangUp HUP - + @@ -673,7 +762,8 @@ HyperText Markup Language HTML - The markup language used to create web pages. + Honlapok elõállítására + használt jelölõnyelv. @@ -730,7 +820,7 @@ IP Firewall IPFW - + @@ -738,9 +828,11 @@ IP Version 4 IPv4 - The IP protocol version 4, which uses 32 bits - for addressing. This version is still the most widely used, but it - is slowly being replaced with IPv6. + Az IP protokoll 4-es változata, + ahol 32 biten adunk meg címeket. Ez a változat + még napjainkban is széles körben + alkalmazott, azonban lassanként felváltja az + IPv6. @@ -749,9 +841,12 @@ IP Version 6 IPv6 - The new IP protocol. Invented because the - address space in IPv4 is running out. Uses 128 - bits for addressing. + Az új IP protokoll. + Azért alkották meg, mert az + IPv4 által felkínált + címtér már túlságosan + kicsinek bizonyult. 128 bites címekkel + dolgozik. @@ -759,7 +854,7 @@ Input/Output I/O - + @@ -767,8 +862,10 @@ Intel’s ASL compiler IASL - Intel’s compiler for converting ASL into - AML. + Az Intel által kifejlesztett + fordítóprogram, amivel + ASL-programokat lehet + AML-kódra fordítani. @@ -776,9 +873,11 @@ Internet Message Access Protocol IMAP - A protocol for accessing email messages on a mail server, - characterised by the messages usually being kept on the server as - opposed to being downloaded to the mail reader client. + A levelezõ szervereken tárolt elektronikus + levelek elérésére használt + protokoll, aminek egyik fontos jellemzõje, hogy az + elolvasott leveleket a szerveren tartja és nem + tölti le a levelezõ klienssel. @@ -787,7 +886,7 @@ Internet Printing Protocol IPP - + @@ -795,13 +894,17 @@ Internet Protocol IP - The packet transmitting protocol that is the basic protocol on - the Internet. Originally developed at the U.S. Department of - Defense and an extremly important part of the TCP/IP - stack. Without the Internet Protocol, the Internet - would not have become what it is today. For more information, see - - RFC 791. + Csomagok átküldését + leíró protokoll, amire egész internet + épül. Eredetileg az Egyesült Államok + Védelmi Minisztériuma számára + készült, és a TCP/IP + protokollkészlet egyik meghatározó eleme. + Enélkül az internet nem nyerte volna el mai + alakját. Részletesebb + információkért ld. az RFC + 791. @@ -809,7 +912,9 @@ Internet Service Provider ISP - A company that provides access to the Internet. + Egy olyan cég, ami lehetõséget + kínál az internet + elérésére. @@ -819,10 +924,11 @@ KAME - Japanese for turtle, the term KAME is used - in computing circles to refer to the KAME Project, who work on - an implementation of IPv6. + A KAME japánul teknõst jelent, + de informatikai körökben ezt gyakran a KAME projekttel + azonosítják, amely az IPv6 + implementációján dolgozik. @@ -855,8 +961,11 @@ Kernel &man.ld.1; KLD - A method of dynamically loading functionality into a &os; kernel - without rebooting the system. + Egy olyan módszer, aminek + segítségével a &os; rendszermag + funkcionalitását anélkül tudjuk + dinamikusan bõvíteni, hogy a újra kellene + indítanunk hozzá a rendszerünket. @@ -864,9 +973,11 @@ Kernel Scheduler Entities KSE - A kernel-supported threading system. See the project home page - for further details. + A rendszermag által támogatott + szálkezelési rendszer. Ennek pontosabb + részleteit ld. a + hozzátartozó projekt + honlapján. @@ -874,7 +985,7 @@ Kernel Virtual Address KVA - + @@ -882,7 +993,7 @@ Key Distribution Center KDC - + @@ -890,9 +1001,12 @@ Kilo Bits Per Second Kbps - Used to measure bandwith (how much data can pass a given - point at a specified amount of time). Alternates to the Kilo - prefix include Mega, Giga, Tera, and so forth. + A sávszélesség (vagyis egy adott + idõ alatt mennyi adatot vagyunk képesek + átküldeni) meghatározására + használt mérték. Itt a Kilo helyett + még szerepelhet a Mega, Giga, Tera és így + tovább. @@ -919,7 +1033,7 @@ Line Printer Daemon LPD - + @@ -927,8 +1041,9 @@ Local Area Network LAN - A network used on a local area, e.g. office, home, or so forth. - + Egy viszonylag kis környezetben, + például irodában, otthon stb. + használt hálózat. @@ -936,20 +1051,27 @@ Lock Order Reversal LOR - The &os; kernel uses a number of resource locks to - arbitrate contention for those resources. A run-time - lock diagnostic system found in &os.current; kernels - (but removed for releases), called &man.witness.4;, - detects the potential for deadlocks due to locking errors. - (&man.witness.4; is actually slightly conservative, so - it is possible to get false positives.) A true positive - report indicates that if you were unlucky, a deadlock would - have happened here. + A &os; rendszermagja az erõforrások + megfelelõ zárolásával igyekszik + megosztani azokat. A zárolási hibák + keletkezõ holtpontok felderítésére a + &os.current; rendszermagokban található (de a + kiadásokból már + eltávolított) egy zárolásokat + ellenõrzõ futás idejû rendszer, aminek a + neve &man.witness.4;. (A &man.witness.4; jelen pillanatban + kissé még szigorú, ezért + elõfordulhat, hogy vakriasztást ad.) A tõle + származó valós jelentésekben + olvashatjuk, hogy ha pórul jártunk volna, + akkor most itt lett volna egy holtpont. - True positive LORs tend to get fixed quickly, so - check &a.current.url; and the - - LORs Seen page before posting to the mailing lists. + Az ilyen hibákat általában gyorsan + kijavítják, ezért mielõtt egy ilyen + hibát beküldenénk, nézzünk + szét a &a.current.url; címen és az + észlelt LOR-ok honlapján. @@ -1011,11 +1133,15 @@ Mail Transfer Agent MTA - An application used to transfer email. An - MTA has traditionally been part of the BSD - base system. Today Sendmail is included in the base system, but - there are many other MTAs, such as postfix, - qmail and Exim. + A levelek továbbítására + használt alkalmazás, melyek a BSD + alaprendszerekben már régóta + megtalálhatóak. Közülük + manapság a Sendmail szerepel itt, de rajta + kívül még több más + MTA is létezik, mint + például a postfix, qmail és az + Exim. @@ -1023,7 +1149,9 @@ Mail User Agent MUA - An application used by users to display and write email. + Az elektronikus levelek + megjelenítésére és + írására alkalmas alkalmazás. @@ -1031,7 +1159,7 @@ Mandatory Access Control MAC - + @@ -1039,7 +1167,7 @@ Massachusetts Institute of Technology MIT - + @@ -1047,8 +1175,11 @@ Merge From Current MFC - To merge functionality or a patch from the -CURRENT - branch to another, most often -STABLE. + A -CURRENT ágból származó + valamelyik funkcionalitás vagy + módosítás beolvasztása egy + másik ágba, ami a legtöbb esetben a + -STABLE. @@ -1056,8 +1187,9 @@ Merge From Perforce MFP4 - To merge functionality or a patch from the Perforce - repository to the -CURRENT branch. + A Perforce repository-ból származó + funkcionalitás vagy módosítás + beolvasztása a -CURRENT ágba. @@ -1066,13 +1198,20 @@ Merge From Stable MFS - In the normal course of FreeBSD development, a change will - be committed to the -CURRENT branch for testing before being - merged to -STABLE. On rare occasions, a change will go into - -STABLE first and then be merged to -CURRENT. + A &os; fejlesztésének megszokott menete + szerint egy változtatás elõször a + -CURRENT ágba kerül be tesztelésre, majd + csak ezt követõen a -STABLE ágba. + Esetenként azonban elõfordul, hogy egy + változtatás elõször a -STABLE + ágba kerül, majd csak ezután a -CURRENT + ágba. - This term is also used when a patch is merged from -STABLE - to a security branch. + Ezt a kifejezést használjuk abban az esetben + is, amikor egy módosítást a -STABLE + ágból olvasztunk be a biztonsági + javításokat tartalmazó + ágba. @@ -1081,8 +1220,10 @@ Message Of The Day MOTD - A message, usually shown on login, often used to - distribute information to users of the system. + Általában a bejelentkezéskor + megjelenõ üzenet, amiben valamilyen + információt továbbítunk a rendszer + felhasználói számára. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 12 21:51:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2B991065754; Sat, 12 Apr 2008 21:51:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6413F1065747 for ; Sat, 12 Apr 2008 21:51:57 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 281038FC14 for ; Sat, 12 Apr 2008 21:51:57 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CLpv8q019264 for ; Sat, 12 Apr 2008 21:51:57 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CLpu8k019262 for perforce@freebsd.org; Sat, 12 Apr 2008 21:51:56 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 12 Apr 2008 21:51:56 GMT Message-Id: <200804122151.m3CLpu8k019262@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 21:51:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=139940 Change 139940 by pgj@disznohal on 2008/04/12 21:51:16 (network-servers) MFen: 1.103 --> 1.104 Affected files ... .. //depot/projects/docproj_hu/books/handbook/network-servers/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/network-servers/chapter.sgml#5 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.104 --> @@ -5995,7 +5995,7 @@ A Samba konfigurációs állománya a telepítés után - /usr/local/share/examples/smb.conf.default + /usr/local/share/examples/samba/smb.conf.default néven található meg. Ezt kell lemásolnunk /usr/local/etc/smb.conf néven, amit majd aztán a From owner-p4-projects@FreeBSD.ORG Sat Apr 12 22:09:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 959671065672; Sat, 12 Apr 2008 22:09:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57F22106564A for ; Sat, 12 Apr 2008 22:09:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 349F38FC1B for ; Sat, 12 Apr 2008 22:09:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CM9FRn024497 for ; Sat, 12 Apr 2008 22:09:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CM9Fmp024495 for perforce@freebsd.org; Sat, 12 Apr 2008 22:09:15 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Apr 2008 22:09:15 GMT Message-Id: <200804122209.m3CM9Fmp024495@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 Cc: Subject: PERFORCE change 139942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 22:09:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=139942 Change 139942 by sam@sam_ebb on 2008/04/12 22:08:58 update Affected files ... .. //depot/projects/vap/share/man/man4/wlan.4#3 edit Differences ... ==== //depot/projects/vap/share/man/man4/wlan.4#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" .\" $FreeBSD: src/share/man/man4/wlan.4,v 1.14 2007/11/13 16:42:22 brueffer Exp $ .\" -.Dd September 6, 2007 +.Dd April 12, 2008 .Dt WLAN 4 .Os .Sh NAME @@ -41,52 +41,97 @@ this layer fills in. The .Nm -is required for the -.Xr an 4 , -.Xr ath 4 , -.Xr awi 4 , -.Xr ipw 4 , -.Xr iwi 4 , -.Xr ral 4 , -.Xr rum 4 , -.Xr ural 4 , -.Xr wi 4 , -.Xr wpi 4 , -and -.Xr zyd 4 -drivers, with other drivers to follow. +module is required by all native 802.11 drivers as well as the +.Xr ndis 4 +support. .Pp -The .Nm -module supports multi-mode devices capable of +supports multi-mode devices capable of operating in both 2.4GHz and 5GHz bands and supports numerous -802.11 protocols: 802.11a, 802.11b, and 802.11g. +802.11 standards: 802.11a, 802.11b, 802.11g, and 802.11n. The WPA, 802.11i, and 802.1x security protocols are supported through a combination of in-kernel code and user-mode applications. -The WME and WMM multi-media protocols are supported entirely within +The WME/WMM multi-media protocols are supported entirely within the .Nm module but require a suitably capable hardware device. +Likewise the 802.11h specification is supported only by suitably +capable devices. +.Pp +Drivers provide 802.11 functionality through +.Nm +interfaces that are created at runtime using interface cloning. +This is done with the +.Xr ifconfig 8 +.Cm create +command or using the +.Va vaps_IFX +variable in +.Xr rc.conf 5 . +Some drivers support the creation of multiple +.Nm +interfaces that share the same underlying device; +this is the way by which ``multi-bss support'' is provided but it +can also be used to create WDS links and other interesting applications. +.Pp +There are several types of +.Nm +interfaces that may be created: +.Bl -tag -width monitor +.It Cm sta +A client station in an infrastructure bss +(i.e. one that associates to an access point). +.It Cm hostap +An access point in an infrastructure bss. +.It Cm adhoc +A station in an IBSS network. +.It Cm ahdemo +A station operating in ``adhoc demo mode''. +This is essentially an IBSS station that does not use management +frames (e.g. no beacons are transmitted). +An +.Cm ahdemo +interface is especially useful for applications that want to transmit +and receive raw 802.11 packets. +.It Cm monitor +An interface used exclusively for capturing 802.11 frames. +In particular this specified to have read-only properties +which enables it to be operated on frequencies where one +would otherwise not be allowed. +.It Cm wds +A station that passes 4-address 802.11 traffic for the purpose +of tunneling traffic over a wireless link. +Typically this station would share the same MAC address as a +.Cm hostap +interface. +It may be possible to create +.Cm wds +interfaces without a companion +.Cm hostap +interface but that is not guaranteed; one may need to create a +.Cm hostap +interface that does not send beacon frames before +.Cm wds +interfaces may be created. +.El +.Pp +More types are planned to support +802.11s mesh nodes (station and ap). +Note that an interface's type cannot be changed once it is created. .Pp -The .Nm -module defines several mechanisms by which plugin modules may -be used to extend functionality. +defines several mechanisms by which plugin modules may +be used to extend its' functionality. Cryptographic support such as WEP, TKIP, and AES-CCMP are implemented -as modules that are loaded on demand (if not statically configured -into a system). +as standalone modules (if not statically configured into a system) +that register with +.Nm . Similarly there is an authenticator framework for defining 802.11 authentication services and a framework for integrating access control mechanisms specific to the 802.11 protocol. .Sh DEBUGGING -If the associated interface is marked for debugging with, for example, +Debugging controls are available using: .Pp -.Dl "ifconfig wi0 debug" -.Pp -then messages describing the operation of the 802.11 protocol will -be sent to the console. -Complete debugging controls are available using: -.Pp .Dl "sysctl net.wlan.X.debug=mask" .Pp where @@ -102,19 +147,15 @@ enables debugging messages related to scanning for an access point, adhoc neighbor, or an unoccupied channel when operation as an access point. The -.Xr 80211debug +.Xr wlandebug 8 tool provides a more user-friendly mechanism for doing the same thing. +Note that .Pp -Many drivers will also display the contents of each 802.11 frame -sent and received when the interface is marked with -both debugging and -.Cm link2 ; -e.g., +.Dl "sysctl net.wlan.debug=mask" .Pp -.Dl "ifconfig wi0 debug link2" -.Pp -Beware however that some management frames may be processed entirely within -the device and not be received by the host. +defines the initial value of the debugging flags for each cloned +.Nm +interface; this is useful to enable debug messages during interface creation. .Sh COMPATIBILITY The module name of .Nm @@ -123,9 +164,11 @@ .Sh SEE ALSO .Xr an 4 , .Xr ath 4 , -.Xr awi 4 , +.Xr bwi 4 , .Xr ipw 4 , .Xr iwi 4 , +.Xr iwn 4 , +.Xr mwl 4 , .Xr netintro 4 , .Xr ral 4 , .Xr rum 4 , @@ -139,7 +182,7 @@ .Xr wpi 4 , .Xr zyd 4 .Sh STANDARDS -More information can be found in the IEEE 802.11 Standard. +More information can be found in the IEEE 802.11 Standards. .Sh HISTORY The .Nm @@ -154,7 +197,8 @@ brought the code into .Fx and then rewrote it to support multi-mode devices, -802.11g, WPA/802.11i, WME, and add the extensible frameworks +802.11g, 802.11n, WPA/802.11i, WME, multi-bss, and +add the extensible frameworks for cryptographic, authentication, and access control plugins. This manual page was written by .An Tom Rhodes Aq trhodes@FreeBSD.org . From owner-p4-projects@FreeBSD.ORG Sat Apr 12 22:11:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6D90106566C; Sat, 12 Apr 2008 22:11:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98F10106564A for ; Sat, 12 Apr 2008 22:11:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 770DC8FC20 for ; Sat, 12 Apr 2008 22:11:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CMBHM4024622 for ; Sat, 12 Apr 2008 22:11:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CMBHcA024620 for perforce@freebsd.org; Sat, 12 Apr 2008 22:11:17 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Apr 2008 22:11:17 GMT Message-Id: <200804122211.m3CMBHcA024620@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 Cc: Subject: PERFORCE change 139943 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 22:11:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=139943 Change 139943 by sam@sam_ebb on 2008/04/12 22:10:55 fixups Affected files ... .. //depot/projects/vap/share/man/man4/wlan_acl.4#3 edit Differences ... ==== //depot/projects/vap/share/man/man4/wlan_acl.4#3 (text+ko) ==== @@ -40,12 +40,11 @@ with 802.11 devices operating as an access point. The .Nm -module is an 802.11 access control plugin module for use with the -.Xr wlan 4 -module. -This module is automatically loaded if an application configures -an access control policy for an 802.11 device operating as an access -point. +must be loaded for +.Xr ifconfig 8 +to handle the +.Cm mac:* +requests. .Sh SEE ALSO .Xr wlan 4 , .Xr ifconfig 8 From owner-p4-projects@FreeBSD.ORG Sat Apr 12 22:11:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A65711065680; Sat, 12 Apr 2008 22:11:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6059B1065718 for ; Sat, 12 Apr 2008 22:11:18 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 051BA8FC29 for ; Sat, 12 Apr 2008 22:11:18 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CMBI3k024627 for ; Sat, 12 Apr 2008 22:11:18 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CMBHd6024625 for perforce@freebsd.org; Sat, 12 Apr 2008 22:11:17 GMT (envelope-from qingli@freebsd.org) Date: Sat, 12 Apr 2008 22:11:17 GMT Message-Id: <200804122211.m3CMBHd6024625@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 139944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 22:11:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=139944 Change 139944 by qingli@FreeBSD-newarp on 2008/04/12 22:11:14 IFC Affected files ... .. //depot/projects/qingli_mpath/doc/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/README#1 branch .. //depot/projects/qingli_mpath/doc/bn_BD.ISO10646-1/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/bn_BD.ISO10646-1/articles/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/bn_BD.ISO10646-1/articles/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/qingli_mpath/doc/da_DK.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/contributing-ports/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/articles.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/qingli_mpath/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/greek-language-support/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/laptop/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/new-users/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/releng/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/releng/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/articles/releng/extra.css#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/faq/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/faq/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/appendix.decl#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/chapter.decl#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/colophon.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/txtfiles.ent#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/mk/doc.local.mk#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/articles.ent#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/books.ent#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/catalog#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/freebsd.ent#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/newsgroups.ent#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/teams.ent#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/translators.ent#1 branch .. //depot/projects/qingli_mpath/doc/el_GR.ISO8859-7/share/sgml/urls.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/building-products/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/building-products/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/compiz-fusion/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/console-server/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/console-server/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/geom-class/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/hats/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/hats/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/hubs/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/hubs/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/linux-emulation/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/linux-emulation/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/linux-users/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/linux-users/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/portbuild/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/rc-scripting/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/rc-scripting/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/remote-install/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/solid-state/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/vinum/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/vinum/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/vm-design/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/bibliography/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/bibliography/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/dev-model/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/dev-model/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/security/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/virtualization/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/pmake/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/pmake/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/pmake/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/share/mk/doc.local.mk#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/README#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/common/freebsd-more-information.xml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/admin.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/applications.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/includes.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/install.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/misc.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/network.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/preface.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/serial.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/FAQ/x.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/fdp-es/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/fdp-es/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/linux-comparison/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/authors.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/articles.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/qingli_mpath/doc/es_ES.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/audit/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/virtualization/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man1/builtin.1#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man1/cat.1#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man1/chkey.1#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man1/echo.1#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man1/head.1#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man1/intro.1#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man4/agp.4#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man4/amd.4#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man4/ncr.4#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man4/sd.4#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man4/sn.4#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man4/spic.4#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man4/st.4#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man5/intro.5#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man5/publickey.5#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man6/intro.6#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man7/ascii.7#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/man/man7/intro.7#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/qingli_mpath/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/laptop/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/laptop/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/linux-comparison/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/multi-os/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/multi-os/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/version-guide/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/flyer/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/flyer/flyer.tex#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/share/sgml/articles.ent#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/share/sgml/catalog#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/share/sgml/l10n.ent#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/share/sgml/newsgroups.ent#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/share/sgml/teams.ent#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/share/sgml/translators.ent#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/slides/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/slides/common/freebsd-5.3.xml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/slides/common/freebsd-dev-model.xml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/slides/common/freebsd-linux-license.xml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/slides/common/freebsd-organization.xml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/slides/common/freebsd-recent-releases.xml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/slides/common/freebsd-release-process.xml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/slides/common/freebsd-users.xml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/slides/common/what-is-freebsd.xml#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/slides/freebsd-general/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/hu_HU.ISO8859-2/slides/freebsd-general/slides.xml#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/Makefile.inc#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/euro/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/euro/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/new-users/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#1 branch .. //depot/projects/qingli_mpath/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 12 22:13:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9303E1065671; Sat, 12 Apr 2008 22:13:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55838106564A for ; Sat, 12 Apr 2008 22:13:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 337A38FC14 for ; Sat, 12 Apr 2008 22:13:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CMDK5C024664 for ; Sat, 12 Apr 2008 22:13:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CMDKZs024662 for perforce@freebsd.org; Sat, 12 Apr 2008 22:13:20 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Apr 2008 22:13:20 GMT Message-Id: <200804122213.m3CMDKZs024662@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 Cc: Subject: PERFORCE change 139945 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 22:13:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=139945 Change 139945 by sam@sam_ebb on 2008/04/12 22:13:08 update Affected files ... .. //depot/projects/vap/share/man/man4/wlan_amrr.4#3 edit Differences ... ==== //depot/projects/vap/share/man/man4/wlan_amrr.4#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" .\" $FreeBSD: src/share/man/man4/wlan_amrr.4,v 1.2 2007/09/10 18:17:50 brueffer Exp $ .\" -.Dd September 10, 2007 +.Dd April 13, 2008 .Dt WLAN_AMRR 4 .Os .Sh NAME @@ -37,15 +37,15 @@ The .Nm module implements the Adaptive Multi-Rate Retry tx rate control -algorithm for use with 802.11 devices. -The -.Nm -module is an 802.11 tx rate control module for use by the -device-independent implementation. +algorithm for use by 802.11 device drivers. .Sh SEE ALSO +.Xr bwi 4 , +.Xr iwn 4 , +.Xr ral 4 , .Xr rum 4 , .Xr ural 4 , .Xr wlan 4 , +.Xr wpi 4 , .Xr zyd 4 .Sh STANDARDS More information can be found in the paper describing the From owner-p4-projects@FreeBSD.ORG Sat Apr 12 22:17:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E77C7106566C; Sat, 12 Apr 2008 22:17:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9FFE1065672 for ; Sat, 12 Apr 2008 22:17:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 88E388FC15 for ; Sat, 12 Apr 2008 22:17:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3CMHOvE024837 for ; Sat, 12 Apr 2008 22:17:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CMHOZf024835 for perforce@freebsd.org; Sat, 12 Apr 2008 22:17:24 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Apr 2008 22:17:24 GMT Message-Id: <200804122217.m3CMHOZf024835@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 Cc: Subject: PERFORCE change 139946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2008 22:17:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=139946 Change 139946 by sam@sam_ebb on 2008/04/12 22:17:12 update Affected files ... .. //depot/projects/vap/share/man/man4/wlan_xauth.4#3 edit Differences ... ==== //depot/projects/vap/share/man/man4/wlan_xauth.4#3 (text+ko) ==== @@ -36,7 +36,9 @@ .Sh DESCRIPTION The .Nm -module implements an authenticator plugin that is intended +module is a +.Xr wlan 4 +authenticator plugin for use with user-mode authentication implementations such as .Nm hostapd . @@ -44,13 +46,10 @@ As a result, 802.11 stations that associate are not authorized to send or receive frames until they are authorized by an external agent; typically using a protocol such as WPA, 802.1x, or 802.11i. -The -.Nm -module is an 802.11 authenticator plugin module for use by the -.Xr wlan 4 -module. -This module is automatically loaded if an application configures -an 802.11 device for operation as an AP with WPA or 802.1x authentication. +.Pp +This module is automatically loaded by the rc script that normally +starts +.Xr hostapd 8 . .Sh SEE ALSO .Xr wlan 4 .Sh STANDARDS