svn commit: r281591 - head/bin/csh
Author: tijl Date: Thu Apr 16 07:17:00 2015 New Revision: 281591 URL: https://svnweb.freebsd.org/changeset/base/281591 Log: Fix build after r281550 when WITHOUT_ICONV is defined. Reported by: adrian MFC after:2 weeks Modified: head/bin/csh/iconv_stub.h Modified: head/bin/csh/iconv_stub.h == --- head/bin/csh/iconv_stub.h Thu Apr 16 06:23:58 2015(r281590) +++ head/bin/csh/iconv_stub.h Thu Apr 16 07:17:00 2015(r281591) @@ -30,7 +30,7 @@ #define _ICONV_H_ typedef void *iconv_t; -typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *); +typedef size_t dl_iconv_t(iconv_t, char **, size_t *, char **, size_t *); typedef int dl_iconv_close_t(iconv_t); extern iconv_t dl_iconv_open(const char *, const char *); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281592 - head/sys/dev/usb/wlan
Author: kevlo
Date: Thu Apr 16 07:40:01 2015
New Revision: 281592
URL: https://svnweb.freebsd.org/changeset/base/281592
Log:
Enable LDO to 2.5V before efuse r/w action in order to prevent
incorrect mac address read from efuse.
Reported by: swills
Tested by:rpaulo and myself on RPi
Modified:
head/sys/dev/usb/wlan/if_urtwn.c
Modified: head/sys/dev/usb/wlan/if_urtwn.c
==
--- head/sys/dev/usb/wlan/if_urtwn.cThu Apr 16 07:17:00 2015
(r281591)
+++ head/sys/dev/usb/wlan/if_urtwn.cThu Apr 16 07:40:01 2015
(r281592)
@@ -1195,7 +1195,7 @@ urtwn_efuse_read(struct urtwn_softc *sc)
uint8_t *rom = (uint8_t *)&sc->rom;
uint16_t addr = 0;
uint32_t reg;
- uint8_t off, msk;
+ uint8_t off, msk, vol;
int i;
urtwn_efuse_switch_power(sc);
@@ -1228,10 +1228,15 @@ urtwn_efuse_read(struct urtwn_softc *sc)
printf("\n");
}
#endif
+ /* Disable LDO 2.5V. */
+ vol = urtwn_read_1(sc, R92C_EFUSE_TEST + 3);
+ urtwn_write_1(sc, R92C_EFUSE_TEST + 3, vol & ~(0x80));
+
}
static void
urtwn_efuse_switch_power(struct urtwn_softc *sc)
{
+ uint8_t vol;
uint32_t reg;
reg = urtwn_read_2(sc, R92C_SYS_ISO_CTRL);
@@ -1250,6 +1255,12 @@ urtwn_efuse_switch_power(struct urtwn_so
urtwn_write_2(sc, R92C_SYS_CLKR,
reg | R92C_SYS_CLKR_LOADER_EN | R92C_SYS_CLKR_ANA8M);
}
+
+ /* Enable LDO 2.5V. */
+ vol = urtwn_read_1(sc, R92C_EFUSE_TEST + 3);
+ vol &= 0x0f;
+ vol |= 0x30;
+ urtwn_write_1(sc, R92C_EFUSE_TEST + 3, (vol | 0x80));
}
static int
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281599 - head/sys/netinet
Author: jch
Date: Thu Apr 16 10:00:06 2015
New Revision: 281599
URL: https://svnweb.freebsd.org/changeset/base/281599
Log:
Fix an old and well-documented use-after-free race condition in
TCP timers:
- Add a reference from tcpcb to its inpcb
- Defer tcpcb deletion until TCP timers have finished
Differential Revision:https://reviews.freebsd.org/D2079
Submitted by: jch, Marc De La Gueronniere
Reviewed by: imp, rrs, adrian, jhb, bz
Approved by: jhb
Sponsored by: Verisign, Inc.
Modified:
head/sys/netinet/tcp_subr.c
head/sys/netinet/tcp_timer.c
head/sys/netinet/tcp_timer.h
head/sys/netinet/tcp_var.h
Modified: head/sys/netinet/tcp_subr.c
==
--- head/sys/netinet/tcp_subr.c Thu Apr 16 09:41:37 2015(r281598)
+++ head/sys/netinet/tcp_subr.c Thu Apr 16 10:00:06 2015(r281599)
@@ -230,6 +230,7 @@ static struct inpcb *tcp_notify(struct i
static struct inpcb *tcp_mtudisc_notify(struct inpcb *, int);
static char * tcp_log_addr(struct in_conninfo *inc, struct tcphdr *th,
void *ip4hdr, const void *ip6hdr);
+static voidtcp_timer_discard(struct tcpcb *, uint32_t);
/*
* Target size of TCP PCB hash tables. Must be a power of two.
@@ -801,7 +802,13 @@ tcp_newtcpcb(struct inpcb *inp)
if (V_tcp_do_sack)
tp->t_flags |= TF_SACK_PERMIT;
TAILQ_INIT(&tp->snd_holes);
- tp->t_inpcb = inp; /* XXX */
+ /*
+* The tcpcb will hold a reference on its inpcb until tcp_discardcb()
+* is called.
+*/
+ in_pcbref(inp); /* Reference for tcpcb */
+ tp->t_inpcb = inp;
+
/*
* Init srtt to TCPTV_SRTTBASE (0), so we can tell that we have no
* rtt estimate. Set rttvar so that srtt + 4 * rttvar gives
@@ -920,6 +927,7 @@ tcp_discardcb(struct tcpcb *tp)
#ifdef INET6
int isipv6 = (inp->inp_vflag & INP_IPV6) != 0;
#endif /* INET6 */
+ int released;
INP_WLOCK_ASSERT(inp);
@@ -927,22 +935,15 @@ tcp_discardcb(struct tcpcb *tp)
* Make sure that all of our timers are stopped before we delete the
* PCB.
*
-* XXXRW: Really, we would like to use callout_drain() here in order
-* to avoid races experienced in tcp_timer.c where a timer is already
-* executing at this point. However, we can't, both because we're
-* running in a context where we can't sleep, and also because we
-* hold locks required by the timers. What we instead need to do is
-* test to see if callout_drain() is required, and if so, defer some
-* portion of the remainder of tcp_discardcb() to an asynchronous
-* context that can callout_drain() and then continue. Some care
-* will be required to ensure that no further processing takes place
-* on the tcpcb, even though it hasn't been freed (a flag?).
-*/
- callout_stop(&tp->t_timers->tt_rexmt);
- callout_stop(&tp->t_timers->tt_persist);
- callout_stop(&tp->t_timers->tt_keep);
- callout_stop(&tp->t_timers->tt_2msl);
- callout_stop(&tp->t_timers->tt_delack);
+* If stopping a timer fails, we schedule a discard function in same
+* callout, and the last discard function called will take care of
+* deleting the tcpcb.
+*/
+ tcp_timer_stop(tp, TT_REXMT);
+ tcp_timer_stop(tp, TT_PERSIST);
+ tcp_timer_stop(tp, TT_KEEP);
+ tcp_timer_stop(tp, TT_2MSL);
+ tcp_timer_stop(tp, TT_DELACK);
/*
* If we got enough samples through the srtt filter,
@@ -1019,8 +1020,80 @@ tcp_discardcb(struct tcpcb *tp)
CC_ALGO(tp) = NULL;
inp->inp_ppcb = NULL;
- tp->t_inpcb = NULL;
- uma_zfree(V_tcpcb_zone, tp);
+ if ((tp->t_timers->tt_flags & TT_MASK) == 0) {
+ /* We own the last reference on tcpcb, let's free it. */
+ tp->t_inpcb = NULL;
+ uma_zfree(V_tcpcb_zone, tp);
+ released = in_pcbrele_wlocked(inp);
+ KASSERT(!released, ("%s: inp %p should not have been released "
+ "here", __func__, inp));
+ }
+}
+
+void
+tcp_timer_2msl_discard(void *xtp)
+{
+
+ tcp_timer_discard((struct tcpcb *)xtp, TT_2MSL);
+}
+
+void
+tcp_timer_keep_discard(void *xtp)
+{
+
+ tcp_timer_discard((struct tcpcb *)xtp, TT_KEEP);
+}
+
+void
+tcp_timer_persist_discard(void *xtp)
+{
+
+ tcp_timer_discard((struct tcpcb *)xtp, TT_PERSIST);
+}
+
+void
+tcp_timer_rexmt_discard(void *xtp)
+{
+
+ tcp_timer_discard((struct tcpcb *)xtp, TT_REXMT);
+}
+
+void
+tcp_timer_delack_discard(void *xtp)
+{
+
+ tcp_timer_discard((struct tcpcb *)xtp, TT_DELACK);
+}
+
+void
+tcp_timer_discard(struct tcpcb *tp, uint32_t timer_type)
+{
+ struct inpcb *inp;
+
+ CURVNET_SET(tp->t_vnet);
+ INP_INFO_WLOCK(&V_tc
svn commit: r281600 - head/lib/libcompiler_rt
Author: emaste Date: Thu Apr 16 12:54:28 2015 New Revision: 281600 URL: https://svnweb.freebsd.org/changeset/base/281600 Log: compiler_rt: add floatunsitf for arm64 It provides unsigned integer to quad-precision conversion. Sponsored by: The FreeBSD Foundation Modified: head/lib/libcompiler_rt/Makefile Modified: head/lib/libcompiler_rt/Makefile == --- head/lib/libcompiler_rt/MakefileThu Apr 16 10:00:06 2015 (r281599) +++ head/lib/libcompiler_rt/MakefileThu Apr 16 12:54:28 2015 (r281600) @@ -144,6 +144,7 @@ SRCF+= addtf3 \ fixunstfdi \ fixunstfsi \ fixunstfti \ + floatunsitf \ multf3 \ subtf3 \ trunctfdf2 \ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281601 - head/sys/sys
Author: jhb
Date: Thu Apr 16 12:58:51 2015
New Revision: 281601
URL: https://svnweb.freebsd.org/changeset/base/281601
Log:
Remove THRMISC_VERSION. The thrmisc structure doesn't include a version
number, so this wasn't used (and can't easily be added). If at some point
we want to extend thrmisc, we will probably need to just add a new note
type and ensure that the new type includes a version number.
Discussed with: kib
MFC after:2 weeks
Modified:
head/sys/sys/procfs.h
Modified: head/sys/sys/procfs.h
==
--- head/sys/sys/procfs.h Thu Apr 16 12:54:28 2015(r281600)
+++ head/sys/sys/procfs.h Thu Apr 16 12:58:51 2015(r281601)
@@ -80,8 +80,6 @@ typedef struct prpsinfo {
char pr_psargs[PRARGSZ+1]; /* Arguments, null terminated (1) */
} prpsinfo_t;
-#define THRMISC_VERSION1 /* Current version of thrmisc_t
*/
-
typedef struct thrmisc {
char pr_tname[MAXCOMLEN+1]; /* Thread name, null terminated (1) */
u_int _pad; /* Convenience pad, 0-filled (1) */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281602 - svnadmin/conf
Author: jhb Date: Thu Apr 16 13:25:22 2015 New Revision: 281602 URL: https://svnweb.freebsd.org/changeset/base/281602 Log: Release Julien Charbon (jch@) from mentorship. Modified: svnadmin/conf/mentors Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Thu Apr 16 12:58:51 2015(r281601) +++ svnadmin/conf/mentors Thu Apr 16 13:25:22 2015(r281602) @@ -19,7 +19,6 @@ eri gnn Co-mentor: thompsa erjgnn Co-mentor: jfv jahkib jceel wkoszek Co-mentor: cognet -jchjhb jkhrwatson jonathan rwatson jwdrmacklem ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281603 - stable/10/sys/sys
Author: jhb Date: Thu Apr 16 15:09:46 2015 New Revision: 281603 URL: https://svnweb.freebsd.org/changeset/base/281603 Log: MFC 280222: Clear an mbuf's external storage flags in m_extaddref(). They are cleared in other places that set the external storage type (ext_type) such as m_cljset(), m_extadd(), mb_ctor_clust(), and vn_sendfile(). Modified: stable/10/sys/sys/mbuf.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/sys/mbuf.h == --- stable/10/sys/sys/mbuf.hThu Apr 16 13:25:22 2015(r281602) +++ stable/10/sys/sys/mbuf.hThu Apr 16 15:09:46 2015(r281603) @@ -564,6 +564,7 @@ m_extaddref(struct mbuf *m, caddr_t buf, m->m_ext.ext_arg1 = arg1; m->m_ext.ext_arg2 = arg2; m->m_ext.ext_type = EXT_EXTREF; + m->m_ext.ext_flags = 0; } static __inline uma_zone_t ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281605 - head/share/man/man3
Author: brooks Date: Thu Apr 16 15:35:17 2015 New Revision: 281605 URL: https://svnweb.freebsd.org/changeset/base/281605 Log: Fix a minor function definition inconsistancy. MFC after:3 days Modified: head/share/man/man3/queue.3 Modified: head/share/man/man3/queue.3 == --- head/share/man/man3/queue.3 Thu Apr 16 15:34:22 2015(r281604) +++ head/share/man/man3/queue.3 Thu Apr 16 15:35:17 2015(r281605) @@ -147,7 +147,7 @@ lists and tail queues .Fn STAILQ_INSERT_AFTER "STAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_INSERT_HEAD "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_INSERT_TAIL "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" -.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME" +.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_NEXT "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281604 - in head: . share/mk
Author: brooks
Date: Thu Apr 16 15:34:22 2015
New Revision: 281604
URL: https://svnweb.freebsd.org/changeset/base/281604
Log:
Make it harder to specify invalid LIBADD by causing values without
corresponding DPADD_ variables to produce a useful error message.
Differential Revision:https://reviews.freebsd.org/D2295
Reviewed by: bapt
Sponsored by: DARPA, AFRL
Modified:
head/UPDATING
head/share/mk/src.libnames.mk
Modified: head/UPDATING
==
--- head/UPDATING Thu Apr 16 15:09:46 2015(r281603)
+++ head/UPDATING Thu Apr 16 15:34:22 2015(r281604)
@@ -35,6 +35,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
The const qualifier has been removed from iconv(3) to comply with
POSIX. The ports tree is aware of this from r384038 onwards.
+20150416:
+ Libraries specified by LIBADD in Makefiles must have a corresponding
+ DPADD_ variable to ensure correct dependencies. This is now
+ enforced in src.libnames.mk.
+
20150324:
From legacy ata(4) driver was removed support for SATA controllers
supported by more functional drivers ahci(4), siis(4) and mvs(4).
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Thu Apr 16 15:09:46 2015
(r281603)
+++ head/share/mk/src.libnames.mk Thu Apr 16 15:34:22 2015
(r281604)
@@ -282,10 +282,14 @@ LDADD_gssapi_krb5+= ${LDADD_pthread}
.if ${_PRIVATELIBS:M${_l}}
USEPRIVATELIB+=${_l}
.endif
-DPADD+=${DPADD_${_l}}
+DPADD+=${DPADD_${_l}:Umissing-dpadd_${_l}}
LDADD+=${LDADD_${_l}}
.endfor
+.if defined(DPADD) && ${DPADD:Mmissing-dpadd_*}
+.error Missing ${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//:S/^/DPADD_/}
variable add "${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//}" to _LIBRARIES,
_INTERNALLIBS, or _PRIVATELIBS and define
"${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//:S/^/LIB/:tu}".
+.endif
+
.if defined(USEPRIVATELIB)
LDFLAGS+= -rpath ${LIBPRIVATEDIR}
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281606 - head/sys/crypto/aesni
Author: rodrigc Date: Thu Apr 16 17:42:52 2015 New Revision: 281606 URL: https://svnweb.freebsd.org/changeset/base/281606 Log: In the version of gcc in the FreeBSD tree, this modification was made to the compiler in svn r242182: #if STDC_HOSTED #include #endif A similar change was done to clang in the FreeBSD tree in svn r218893: However, for external gcc toolchains, this patch is not in the compiler's header file. This patch to FreeBSD's aesni code allows compilation with an external gcc toolchain. Differential Revision: https://reviews.freebsd.org/D2285 Reviewed by: jmg, dim Approved by: dim Added: head/sys/crypto/aesni/aesni_os.h (contents, props changed) Modified: head/sys/crypto/aesni/aesencdec.h head/sys/crypto/aesni/aesni_ghash.c Modified: head/sys/crypto/aesni/aesencdec.h == --- head/sys/crypto/aesni/aesencdec.h Thu Apr 16 15:35:17 2015 (r281605) +++ head/sys/crypto/aesni/aesencdec.h Thu Apr 16 17:42:52 2015 (r281606) @@ -27,6 +27,8 @@ * */ +#include + #include static inline void Modified: head/sys/crypto/aesni/aesni_ghash.c == --- head/sys/crypto/aesni/aesni_ghash.c Thu Apr 16 15:35:17 2015 (r281605) +++ head/sys/crypto/aesni/aesni_ghash.c Thu Apr 16 17:42:52 2015 (r281606) @@ -67,6 +67,7 @@ #ifdef _KERNEL #include +#include #else #include #endif Added: head/sys/crypto/aesni/aesni_os.h == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/crypto/aesni/aesni_os.hThu Apr 16 17:42:52 2015 (r281606) @@ -0,0 +1,33 @@ +/*- + * Copyright 2015 Craig Rodrigues + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (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$ + * + */ + +#if defined(__GNUC__) && defined(_KERNEL) +/* Suppress inclusion of gcc's mm_malloc.h header */ +#define _MM_MALLOC_H_INCLUDED 1 +#endif ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281608 - stable/10/sys/sys
Author: markj
Date: Thu Apr 16 19:04:38 2015
New Revision: 281608
URL: https://svnweb.freebsd.org/changeset/base/281608
Log:
MFC r281225:
Add B_KVAALLOC and B_UNMAPPED to the buf flag name list.
Modified:
stable/10/sys/sys/buf.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/sys/buf.h
==
--- stable/10/sys/sys/buf.h Thu Apr 16 18:47:28 2015(r281607)
+++ stable/10/sys/sys/buf.h Thu Apr 16 19:04:38 2015(r281608)
@@ -226,8 +226,8 @@ struct buf {
#define PRINT_BUF_FLAGS "\20\40remfree\37cluster\36vmio\35ram\34managed" \
"\33paging\32infreecnt\31nocopy\30b23\27relbuf\26dirty\25b20" \
"\24b19\23b18\22clusterok\21malloc\20nocache\17b14\16inval" \
- "\15b12\14b11\13eintr\12done\11persist\10delwri\7validsuspwrt" \
- "\6cache\5deferred\4direct\3async\2needcommit\1age"
+ "\15kvaalloc\14unmapped\13eintr\12done\11persist\10delwri" \
+ "\7validsuspwrt\6cache\5deferred\4direct\3async\2needcommit\1age"
/*
* These flags are kept in b_xflags.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281609 - in stable/10: share/man/man4 sys/netinet
Author: markj
Date: Thu Apr 16 19:09:25 2015
New Revision: 281609
URL: https://svnweb.freebsd.org/changeset/base/281609
Log:
MFC r272378:
Add net.inet.icmp.tstamprepl.
PR: 193689
Modified:
stable/10/share/man/man4/icmp.4
stable/10/sys/netinet/ip_icmp.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/man/man4/icmp.4
==
--- stable/10/share/man/man4/icmp.4 Thu Apr 16 19:04:38 2015
(r281608)
+++ stable/10/share/man/man4/icmp.4 Thu Apr 16 19:09:25 2015
(r281609)
@@ -32,7 +32,7 @@
.\" @(#)icmp.4 8.1 (Berkeley) 6/5/93
.\" $FreeBSD$
.\"
-.Dd February 9, 2007
+.Dd September 30, 2014
.Dt ICMP 4
.Os
.Sh NAME
@@ -220,6 +220,10 @@ instead of the possibly different return
Number of bytes from original packet to quote in ICMP reply.
This number is internally enforced to be at least 8 bytes (per RFC792)
and at most the maximal space left in the ICMP reply mbuf.
+.It Va tstamprepl
+.Pq Vt boolean
+Enable/disable replies to ICMP Timestamp packets.
+Defaults to true.
.El
.Sh ERRORS
A socket operation may fail with one of the following errors returned:
Modified: stable/10/sys/netinet/ip_icmp.c
==
--- stable/10/sys/netinet/ip_icmp.c Thu Apr 16 19:04:38 2015
(r281608)
+++ stable/10/sys/netinet/ip_icmp.c Thu Apr 16 19:09:25 2015
(r281609)
@@ -148,6 +148,10 @@ SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO
&VNET_NAME(icmpbmcastecho), 0,
"");
+static VNET_DEFINE(int, icmptstamprepl) = 1;
+#defineV_icmptstampreplVNET(icmptstamprepl)
+SYSCTL_INT(_net_inet_icmp, OID_AUTO, tstamprepl, CTLFLAG_RW,
+ &VNET_NAME(icmptstamprepl), 0, "Respond to ICMP Timestamp packets");
#ifdef ICMPPRINTFS
inticmpprintfs = 0;
@@ -541,6 +545,8 @@ icmp_input(struct mbuf *m, int off)
goto reflect;
case ICMP_TSTAMP:
+ if (V_icmptstamprepl == 0)
+ break;
if (!V_icmpbmcastecho
&& (m->m_flags & (M_MCAST | M_BCAST)) != 0) {
ICMPSTAT_INC(icps_bmcasttstamp);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281610 - head/sys/arm64/conf
Author: emaste Date: Thu Apr 16 19:23:08 2015 New Revision: 281610 URL: https://svnweb.freebsd.org/changeset/base/281610 Log: Set MACHINE_ARCH to aarch64 for arm64 Reviewed by: imp Sponsored by: The FreeBSD Foundation Modified: head/sys/arm64/conf/DEFAULTS Modified: head/sys/arm64/conf/DEFAULTS == --- head/sys/arm64/conf/DEFAULTSThu Apr 16 19:09:25 2015 (r281609) +++ head/sys/arm64/conf/DEFAULTSThu Apr 16 19:23:08 2015 (r281610) @@ -3,7 +3,7 @@ # # $FreeBSD$ -machinearm64 +machinearm64 aarch64 # Pseudo devices. device mem # Memory and kernel memory devices ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281611 - head/usr.sbin/bhyve
Author: neel
Date: Thu Apr 16 20:11:49 2015
New Revision: 281611
URL: https://svnweb.freebsd.org/changeset/base/281611
Log:
If the number of guest vcpus is less than '1' then flag it as an error.
MFC after:1 week
Modified:
head/usr.sbin/bhyve/bhyverun.c
Modified: head/usr.sbin/bhyve/bhyverun.c
==
--- head/usr.sbin/bhyve/bhyverun.c Thu Apr 16 19:23:08 2015
(r281610)
+++ head/usr.sbin/bhyve/bhyverun.c Thu Apr 16 20:11:49 2015
(r281611)
@@ -805,6 +805,11 @@ main(int argc, char *argv[])
exit(1);
}
+ if (guest_ncpus < 1) {
+ fprintf(stderr, "Invalid guest vCPUs (%d)\n", guest_ncpus);
+ exit(1);
+ }
+
max_vcpus = num_vcpus_allowed(ctx);
if (guest_ncpus > max_vcpus) {
fprintf(stderr, "%d vCPUs requested but only %d available\n",
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281612 - head/sys/amd64/vmm/amd
Author: neel
Date: Thu Apr 16 20:15:47 2015
New Revision: 281612
URL: https://svnweb.freebsd.org/changeset/base/281612
Log:
Prefer 'vcpu_should_yield()' over checking 'curthread->td_flags' directly.
MFC after:1 week
Modified:
head/sys/amd64/vmm/amd/svm.c
Modified: head/sys/amd64/vmm/amd/svm.c
==
--- head/sys/amd64/vmm/amd/svm.cThu Apr 16 20:11:49 2015
(r281611)
+++ head/sys/amd64/vmm/amd/svm.cThu Apr 16 20:15:47 2015
(r281612)
@@ -1917,7 +1917,7 @@ svm_vmrun(void *arg, int vcpu, register_
}
/* We are asked to give the cpu by scheduler. */
- if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED)) {
+ if (vcpu_should_yield(vm, vcpu)) {
enable_gintr();
vm_exit_astpending(vm, vcpu, state->rip);
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281613 - in head: . etc/mtree include sbin/pfctl sys/conf sys/contrib/altq/altq sys/net sys/net/altq sys/netpfil/pf sys/sys
Author: glebius
Date: Thu Apr 16 20:22:40 2015
New Revision: 281613
URL: https://svnweb.freebsd.org/changeset/base/281613
Log:
Move ALTQ from contrib to net/altq. The ALTQ code is for many years
discontinued by its initial authors. In FreeBSD the code was already
slightly edited during the pf(4) SMP project. It is about to be edited
more in the projects/ifnet. Moving out of contrib also allows to remove
several hacks to the make glue.
Reviewed by: net@
Added:
head/sys/net/altq/
- copied from r281610, head/sys/contrib/altq/altq/
Deleted:
head/sys/contrib/altq/altq/
Modified:
head/ObsoleteFiles.inc
head/etc/mtree/BSD.include.dist
head/include/Makefile
head/sbin/pfctl/parse.y
head/sbin/pfctl/pfctl.c
head/sbin/pfctl/pfctl_altq.c
head/sbin/pfctl/pfctl_qstats.c
head/sys/conf/files
head/sys/conf/kern.pre.mk
head/sys/conf/kmod.mk
head/sys/net/altq/altq.h
head/sys/net/altq/altq_cbq.c
head/sys/net/altq/altq_cbq.h
head/sys/net/altq/altq_cdnr.c
head/sys/net/altq/altq_cdnr.h
head/sys/net/altq/altq_hfsc.c
head/sys/net/altq/altq_hfsc.h
head/sys/net/altq/altq_priq.c
head/sys/net/altq/altq_priq.h
head/sys/net/altq/altq_red.c
head/sys/net/altq/altq_red.h
head/sys/net/altq/altq_rio.c
head/sys/net/altq/altq_rio.h
head/sys/net/altq/altq_rmclass.c
head/sys/net/altq/altq_rmclass.h
head/sys/net/altq/altq_subr.c
head/sys/net/altq/if_altq.h
head/sys/net/if_var.h
head/sys/net/ifq.h
head/sys/netpfil/pf/pf_ioctl.c
head/sys/sys/param.h
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Thu Apr 16 20:15:47 2015(r281612)
+++ head/ObsoleteFiles.inc Thu Apr 16 20:22:40 2015(r281613)
@@ -38,6 +38,21 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150416: ALTQ moved to net/altq
+OLD_FILES+=usr/include/altq/altq_rmclass_debug.h
+OLD_FILES+=usr/include/altq/altq.h
+OLD_FILES+=usr/include/altq/altq_cdnr.h
+OLD_FILES+=usr/include/altq/altq_hfsc.h
+OLD_FILES+=usr/include/altq/altq_priq.h
+OLD_FILES+=usr/include/altq/altqconf.h
+OLD_FILES+=usr/include/altq/altq_classq.h
+OLD_FILES+=usr/include/altq/altq_red.h
+OLD_FILES+=usr/include/altq/if_altq.h
+OLD_FILES+=usr/include/altq/altq_var.h
+OLD_FILES+=usr/include/altq/altq_rmclass.h
+OLD_FILES+=usr/include/altq/altq_cbq.h
+OLD_FILES+=usr/include/altq/altq_rio.h
+OLD_DIRS+=usr/include/altq
# 20150410
OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz
OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz
Modified: head/etc/mtree/BSD.include.dist
==
--- head/etc/mtree/BSD.include.dist Thu Apr 16 20:15:47 2015
(r281612)
+++ head/etc/mtree/BSD.include.dist Thu Apr 16 20:22:40 2015
(r281613)
@@ -5,8 +5,6 @@
/set type=dir uname=root gname=wheel mode=0755
.
-altq
-..
arpa
..
atf-c
@@ -254,6 +252,8 @@
..
..
net
+altq
+..
..
net80211
..
Modified: head/include/Makefile
==
--- head/include/Makefile Thu Apr 16 20:15:47 2015(r281612)
+++ head/include/Makefile Thu Apr 16 20:22:40 2015(r281613)
@@ -50,6 +50,7 @@ LSUBDIRS= cam/ata cam/scsi \
geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
geom/mirror geom/mountver geom/multipath geom/nop \
geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \
+ net/altq \
netgraph/atm netgraph/netflow \
security/audit \
security/mac_biba security/mac_bsdextended security/mac_lomac \
@@ -144,7 +145,7 @@ compat:
-p ${DESTDIR}${INCLUDEDIR}
copies:
-.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc \
+.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto machine machine/pc \
${_MARCHS}
.if exists(${DESTDIR}${INCLUDEDIR}/$i)
cd ${DESTDIR}${INCLUDEDIR}/$i; \
@@ -179,9 +180,6 @@ copies:
cd ${.CURDIR}/../sys/dev/pci; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 pcireg.h \
${DESTDIR}${INCLUDEDIR}/dev/pci
- cd ${.CURDIR}/../sys/contrib/altq/altq; \
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
- ${DESTDIR}${INCLUDEDIR}/altq
cd ${.CURDIR}/../sys/fs/cd9660/; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/isofs/cd9660
@@ -279,11 +277,6 @@ symlinks:
ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
done
.endfor
- cd ${.CURDIR}/../sys/contrib/altq/altq; \
- for h in *.h; do \
- ln -fs ../../../sys/contrib/altq/altq/$$h \
- ${DESTDIR}${INCLUDEDIR}/altq; \
- done
.if ${MK_IPFILTER} != "no"
cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
fo
svn commit: r281614 - head/sys/contrib/altq
Author: glebius Date: Thu Apr 16 20:23:50 2015 New Revision: 281614 URL: https://svnweb.freebsd.org/changeset/base/281614 Log: Remove empty now directory. Deleted: head/sys/contrib/altq/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r281613 - in head: . etc/mtree include sbin/pfctl sys/conf sys/contrib/altq/altq sys/net sys/net/altq sys/netpfil/pf sys/sys
On Apr 16, 2015, at 13:22, Gleb Smirnoff wrote: > Author: glebius > Date: Thu Apr 16 20:22:40 2015 > New Revision: 281613 > URL: https://svnweb.freebsd.org/changeset/base/281613 > > Log: > Move ALTQ from contrib to net/altq. The ALTQ code is for many years > discontinued by its initial authors. In FreeBSD the code was already > slightly edited during the pf(4) SMP project. It is about to be edited > more in the projects/ifnet. Moving out of contrib also allows to remove > several hacks to the make glue. > > Reviewed by: net@ I suspect this needs an UPDATING entry and Relnotes as header include paths were changed. Thanks! signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r281615 - head
Author: imp
Date: Thu Apr 16 20:50:37 2015
New Revision: 281615
URL: https://svnweb.freebsd.org/changeset/base/281615
Log:
People are still getting burned by the byacc upgraded, switch to
always doing byacc until someone figures out the more nuanced version
to switch off of.
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Thu Apr 16 20:23:50 2015(r281614)
+++ head/Makefile.inc1 Thu Apr 16 20:50:37 2015(r281615)
@@ -1304,12 +1304,10 @@ _lex= usr.bin/lex
_awk= usr.bin/awk
.endif
-.if ${BOOTSTRAPPING} < 1001506
_yacc= lib/liby \
usr.bin/yacc
${_bt}-usr.bin/yacc: ${_bt}-lib/liby
-.endif
.if ${MK_BSNMP} != "no"
_gensnmptree= usr.sbin/bsnmpd/gensnmptree
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281616 - in head: sys/boot/forth sys/kern usr.sbin/bsdinstall/scripts
Author: dteske Date: Thu Apr 16 20:53:15 2015 New Revision: 281616 URL: https://svnweb.freebsd.org/changeset/base/281616 Log: Add "GELI Passphrase:" prompt to boot loader. A new loader.conf(5) option of geom_eli_passphrase_prompt="YES" will now allow you to enter your geli(8) root-mount credentials prior to invoking the kernel. See check-password.4th(8) for details. Differential Revision:https://reviews.freebsd.org/D2105 Reviewed by: imp, kmoore Discussed on: -current MFC after:3 days X-MFC-to: stable/10 Relnotes: yes Modified: head/sys/boot/forth/check-password.4th head/sys/boot/forth/check-password.4th.8 head/sys/boot/forth/loader.conf head/sys/kern/init_main.c head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/sys/boot/forth/check-password.4th == --- head/sys/boot/forth/check-password.4th Thu Apr 16 20:50:37 2015 (r281615) +++ head/sys/boot/forth/check-password.4th Thu Apr 16 20:53:15 2015 (r281616) @@ -146,6 +146,15 @@ only forth definitions also password-pro 2drop read-reset else drop then + \ Prompt for GEOM ELI (geli(8)) passphrase if enabled + s" geom_eli_passphrase_prompt" getenv dup -1 <> if + s" YES" compare-insensitive 0= if + s" GELI Passphrase: " read ( prompt -- ) + readval readlen @ s" kern.geom.eli.passphrase" setenv + read-reset + then + else drop then + \ Exit if a password was not set s" password" getenv -1 = if exit else drop then Modified: head/sys/boot/forth/check-password.4th.8 == --- head/sys/boot/forth/check-password.4th.8Thu Apr 16 20:50:37 2015 (r281615) +++ head/sys/boot/forth/check-password.4th.8Thu Apr 16 20:53:15 2015 (r281616) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2011-2012 Devin Teske +.\" Copyright (c) 2011-2015 Devin Teske .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 10, 2012 +.Dd March 20, 2015 .Dt CHECK-PASSWORD.4TH 8 .Os .Sh NAME @@ -33,8 +33,12 @@ .Sh DESCRIPTION The file that goes by the name of .Nm -is a set of commands designed to either prevent booting or prevent modification -of boot options without an appropriately configured password. +is a set of commands designed to do one or more of the following: +.Pp +.Dl o Prevent booting without password +.Dl o Prevent modification of boot options without password +.Dl o Provide a password to mount geli(8) encrypted root disk(s) +.Pp The commands of .Nm by themselves are not enough for most uses. @@ -58,14 +62,23 @@ The commands provided by it are: .Pp .Bl -tag -width disable-module_module -compact -offset indent .It Ic check-password -Dual-purpose function that can either protect the interactive boot menu or -prevent boot without password (separately). +Multi-purpose function that can protect the interactive boot menu, +prevent boot without password, or prompt for geli(8) passphrase +.Pq depending on Xr loader.conf 5 settings . .Pp First checks .Va bootlock_password and if-set, the user cannot continue until the correct password is entered. .Pp -Next checks +Next, checks +.Va geom_eli_passphrase_prompt +and if set to +.Li YES +.Pq case-insensitive +prompts the user to enter their GELI password for later mounting of the root +device(s) during boot. +.Pp +Last, checks .Va password and if-set, tries to .Ic autoboot @@ -81,6 +94,11 @@ The environment variables that effect it Sets the bootlock password (up to 16 characters long) that is required by .Ic check-password to be entered before the system is allowed to boot. +.It Va geom_eli_passphrase_prompt +Selects whether loader(8) will prompt for GELI credentials, handing-off to the +kernel for later mounting of +.Xr geli 8 +encrypted root device(s). .It Va password Sets the password (up to 16 characters long) that is required by .Ic check-password @@ -122,6 +140,16 @@ to prevent booting without password: .Bd -literal -offset indent -compact bootlock_password="boot" .Ed +.Pp +Add the following to +.Xr loader.conf 5 +to generate a prompt at boot to collect GELI credentials for mounting +.Xr geli 8 +encrypted root device(s): +.Pp +.Bd -literal -offset indent -compact +geom_eli_passphrase_prompt="YES" +.Ed .Sh SEE ALSO .Xr loader.conf 5 , .Xr loader 8 , Modified: head/sys/boot/forth/loader.conf == --- head/sys/boot/forth/loader.conf Thu Apr 16 20:50:37 2015 (r281615) +++ head/sys/boot/forth/loader.conf Thu Apr 16 20:53:15 2015 (r281616) @@ -62,6 +62,7 @@ entropy_cache_type="/boot/entropy"
svn commit: r281617 - head/usr.bin/wc
Author: bdrewery
Date: Thu Apr 16 21:44:35 2015
New Revision: 281617
URL: https://svnweb.freebsd.org/changeset/base/281617
Log:
Fix SIGINFO race causing final results to be lost to stderr.
If a SIGINFO comes in after the file is read then the 'siginfo' flag is set to
1 and the next call to show_cnt() (at exit) would print the data to stderr
rather than the expected stdout.
This was found with spamming Poudriere with SIGINFO which caused a 'wc -l'
execution to return no data rather than an expected number.
MFC after:2 weeks
Modified:
head/usr.bin/wc/wc.c
Modified: head/usr.bin/wc/wc.c
==
--- head/usr.bin/wc/wc.cThu Apr 16 20:53:15 2015(r281616)
+++ head/usr.bin/wc/wc.cThu Apr 16 21:44:35 2015(r281617)
@@ -76,6 +76,14 @@ siginfo_handler(int sig __unused)
siginfo = 1;
}
+static void
+reset_siginfo(void)
+{
+
+ signal(SIGINFO, SIG_DFL);
+ siginfo = 0;
+}
+
int
main(int argc, char *argv[])
{
@@ -229,6 +237,7 @@ cnt(const char *file)
} else
tmpll++;
}
+ reset_siginfo();
tlinect += linect;
if (dochar)
tcharct += charct;
@@ -251,6 +260,7 @@ cnt(const char *file)
return (1);
}
if (S_ISREG(sb.st_mode)) {
+ reset_siginfo();
charct = sb.st_size;
show_cnt(file, linect, wordct, charct, llct);
tcharct += charct;
@@ -311,6 +321,7 @@ word: gotsp = 1;
}
}
}
+ reset_siginfo();
if (domulti && MB_CUR_MAX > 1)
if (mbrtowc(NULL, NULL, 0, &mbs) == (size_t)-1 && !warned)
xo_warn("%s", file != NULL ? file : "stdin");
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281618 - head
Author: ngie
Date: Thu Apr 16 21:45:07 2015
New Revision: 281618
URL: https://svnweb.freebsd.org/changeset/base/281618
Log:
Defeat race with MK_KERBEROS == yes introduced with bootstrap-tools
parallelization work done in r279197
- kerberos5/lib/libroken requires kerberos5/tools/make-roken to build
- kerberos5/tools/asn1_compile, kerberos5/tools/slc, and usr.bin/compile_et
require kerberos5/lib/libroken and kerberos5/lib/libvers
This race is incredibly evident when cross-building sparc64 on
ref10-amd64.freebsd.org
MFC after: 1 week
Pointyhat to: ngie
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Thu Apr 16 21:44:35 2015(r281617)
+++ head/Makefile.inc1 Thu Apr 16 21:45:07 2015(r281618)
@@ -1357,8 +1357,13 @@ _kerberos5_bootstrap_tools= \
kerberos5/tools/slc \
usr.bin/compile_et
-${_bt}-kerberos5/tools/slc: ${_bt}-kerberos5/lib/libroken
-${_bt}-kerberos5/tools/asn1_compile: ${_bt}-kerberos5/lib/libroken
+${_bt}-kerberos5/lib/libroken: ${_bt}-kerberos5/tools/make-roken
+${_bt}-kerberos5/tools/asn1_compile: \
+${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
+${_bt}-kerberos5/tools/slc: \
+${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
+${_bt}-usr.bin/compile_et: \
+${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
.endif
bootstrap-tools: .PHONY
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281625 - head/usr.bin/w
Author: allanjude (doc committer)
Date: Thu Apr 16 22:09:37 2015
New Revision: 281625
URL: https://svnweb.freebsd.org/changeset/base/281625
Log:
Fix libxo output from uptime command
the libxo output for uptime returned multiple 'uptime' keys, one each for
number of days, hours, and minutes of uptime.
This is invalid JSON.
This patch makes the output the raw number of seconds, as well as adding keys
for the individual unit values
A string of the original output from the plain-text uptime command is also
added
Differential Revision:https://reviews.freebsd.org/D2063
Reviewed by: jmg
Approved by: marcel
Sponsored by: ScaleEngine Inc.
Modified:
head/usr.bin/w/Makefile
head/usr.bin/w/w.c
Modified: head/usr.bin/w/Makefile
==
--- head/usr.bin/w/Makefile Thu Apr 16 22:06:48 2015(r281624)
+++ head/usr.bin/w/Makefile Thu Apr 16 22:09:37 2015(r281625)
@@ -4,7 +4,7 @@
PROG= w
SRCS= fmt.c pr_time.c proc_compare.c w.c
MAN= w.1 uptime.1
-LIBADD=kvm util xo
+LIBADD=kvm sbuf util xo
#BINGRP= kmem
#BINMODE=2555
LINKS= ${BINDIR}/w ${BINDIR}/uptime
Modified: head/usr.bin/w/w.c
==
--- head/usr.bin/w/w.c Thu Apr 16 22:06:48 2015(r281624)
+++ head/usr.bin/w/w.c Thu Apr 16 22:09:37 2015(r281625)
@@ -54,8 +54,10 @@ static const char sccsid[] = "@(#)w.c8.
#include
#include
#include
+#include
#include
#include
+#include
#include
#include
@@ -472,7 +474,9 @@ pr_header(time_t *nowp, int nusers)
struct timespec tp;
int days, hrs, i, mins, secs;
char buf[256];
+ struct sbuf *upbuf;
+ upbuf = sbuf_new_auto();
/*
* Print time of day.
*/
@@ -493,21 +497,27 @@ pr_header(time_t *nowp, int nusers)
mins = uptime / 60;
secs = uptime % 60;
xo_emit(" up");
- xo_attr("seconds", "%lu", (unsigned long) tp.tv_sec);
+ xo_emit("{e:uptime/%lu}", (unsigned long) tp.tv_sec);
+ xo_emit("{e:days/%d}{e:hours/%d}{e:minutes/%d}{e:seconds/%d}",
days, hrs, mins, secs);
+
if (days > 0)
- xo_emit(" {:uptime/%d day%s},",
+ sbuf_printf(upbuf, " %d day%s,",
days, days > 1 ? "s" : "");
if (hrs > 0 && mins > 0)
- xo_emit(" {:uptime/%2d:%02d},", hrs, mins);
+ sbuf_printf(upbuf, " %2d:%02d,", hrs, mins);
else if (hrs > 0)
- xo_emit(" {:uptime/%d hr%s},",
+ sbuf_printf(upbuf, " %d hr%s,",
hrs, hrs > 1 ? "s" : "");
else if (mins > 0)
- xo_emit(" {:uptime/%d min%s},",
+ sbuf_printf(upbuf, " %d min%s,",
mins, mins > 1 ? "s" : "");
- else
- xo_emit(" {:uptime/%d sec%s},",
+ else
+ sbuf_printf(upbuf, " %d sec%s,",
secs, secs > 1 ? "s" : "");
+ if (sbuf_finish(upbuf) != 0)
+ xo_err(1, "Could not generate output");
+ xo_emit("{:uptime-human/%s}", sbuf_data(upbuf));
+ sbuf_delete(upbuf);
}
/* Print number of users logged in to system */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281626 - head/usr.bin/gzip
Author: delphij Date: Thu Apr 16 22:30:57 2015 New Revision: 281626 URL: https://svnweb.freebsd.org/changeset/base/281626 Log: r281540 was upstreamed as NetBSD r1.108 of gzip.c, note it as merged. Modified: head/usr.bin/gzip/gzip.c Modified: head/usr.bin/gzip/gzip.c == --- head/usr.bin/gzip/gzip.cThu Apr 16 22:09:37 2015(r281625) +++ head/usr.bin/gzip/gzip.cThu Apr 16 22:30:57 2015(r281626) @@ -1,4 +1,4 @@ -/* $NetBSD: gzip.c,v 1.107 2015/01/13 02:37:20 mrg Exp $ */ +/* $NetBSD: gzip.c,v 1.108 2015/04/15 02:29:12 christos Exp $ */ /*- * Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281627 - in head/sys: conf pc98/pc98
Author: emaste
Date: Thu Apr 16 22:34:10 2015
New Revision: 281627
URL: https://svnweb.freebsd.org/changeset/base/281627
Log:
Fix kernel build ${MACHINE} path
$M should be the kernel machine src directory, ${MACHINE}. In most cases
${MACHINE} and ${MACHINE_CPUARCH} are the same, but this is not true for
pc98 and arm64.
It appears we previously set M=${MACHINE_CPUARCH} as a workaround to
accommodate pc98, where MACHINE_CPUARCH is pc98 but it uses
sys/i386/i386/genassym.c.
arm64 relies on this being set correctly, so update $M and add explicit
workarounds for pc98.
Differential Revision:https://reviews.freebsd.org/D2307
Reviewed by: andrew, imp
Sponsored by: The FreeBSD Foundation
Added:
head/sys/pc98/pc98/genassym.c (contents, props changed)
Modified:
head/sys/conf/Makefile.pc98
head/sys/conf/kern.pre.mk
head/sys/conf/kmod.mk
Modified: head/sys/conf/Makefile.pc98
==
--- head/sys/conf/Makefile.pc98 Thu Apr 16 22:30:57 2015(r281626)
+++ head/sys/conf/Makefile.pc98 Thu Apr 16 22:34:10 2015(r281627)
@@ -28,6 +28,9 @@ S=./@
S= ../../..
.endif
.endif
+
+LDSCRIPT_NAME?= ldscript.${MACHINE_ARCH}
+
.include "$S/conf/kern.pre.mk"
ASM_CFLAGS.mpboot.s= ${CLANG_NO_IAS34}
Modified: head/sys/conf/kern.pre.mk
==
--- head/sys/conf/kern.pre.mk Thu Apr 16 22:30:57 2015(r281626)
+++ head/sys/conf/kern.pre.mk Thu Apr 16 22:34:10 2015(r281627)
@@ -26,7 +26,7 @@ KODIR?= /boot/${KERNEL}
LDSCRIPT_NAME?=ldscript.$M
LDSCRIPT?= $S/conf/${LDSCRIPT_NAME}
-M= ${MACHINE_CPUARCH}
+M= ${MACHINE}
AWK?= awk
CP?= cp
Modified: head/sys/conf/kmod.mk
==
--- head/sys/conf/kmod.mk Thu Apr 16 22:30:57 2015(r281626)
+++ head/sys/conf/kmod.mk Thu Apr 16 22:34:10 2015(r281627)
@@ -425,10 +425,10 @@ genassym.o: opt_global.h
.endif
assym.s: ${SYSDIR}/kern/genassym.sh
sh ${SYSDIR}/kern/genassym.sh genassym.o > ${.TARGET}
-genassym.o: ${SYSDIR}/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}/genassym.c
+genassym.o: ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c
genassym.o: ${SRCS:Mopt_*.h}
${CC} -c ${CFLAGS:N-fno-common} \
- ${SYSDIR}/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}/genassym.c
+ ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c
.endif
lint: ${SRCS}
Added: head/sys/pc98/pc98/genassym.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/pc98/pc98/genassym.c Thu Apr 16 22:34:10 2015
(r281627)
@@ -0,0 +1,3 @@
+/* $FreeBSD$ */
+
+#include "../../i386/i386/genassym.c"
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281628 - in head/sys/fs: nfs nfsserver
Author: rmacklem
Date: Thu Apr 16 22:35:15 2015
New Revision: 281628
URL: https://svnweb.freebsd.org/changeset/base/281628
Log:
mav@ has found that NFS servers exporting ZFS file systems
can perform better when using a 128K read/write data size.
This patch changes NFS_MAXDATA from 64K to 128K so that
clients can use 128K for NFS mounts to allow this.
The patch also renames NFS_MAXDATA to NFS_SRVMAXIO so
that it is clear that it applies to the NFS server side
only. It also avoids a name conflict with the NFS_MAXDATA
defined in rpcsvc/nfs_prot.h, that is used for userland RPC.
Tested by:mav
Reviewed by: mav
MFC after:2 weeks
Modified:
head/sys/fs/nfs/nfs.h
head/sys/fs/nfs/nfs_commonport.c
head/sys/fs/nfs/nfsproto.h
head/sys/fs/nfsserver/nfs_nfsdserv.c
Modified: head/sys/fs/nfs/nfs.h
==
--- head/sys/fs/nfs/nfs.h Thu Apr 16 22:34:10 2015(r281627)
+++ head/sys/fs/nfs/nfs.h Thu Apr 16 22:35:15 2015(r281628)
@@ -159,7 +159,7 @@
(t).tv_sec = time.tv_sec; (t).tv_nsec = 1000 * time.tv_usec; } while (0)
#defineNFS_SRVMAXDATA(n)
\
(((n)->nd_flag & (ND_NFSV3 | ND_NFSV4)) ? \
-NFS_MAXDATA : NFS_V2MAXDATA)
+NFS_SRVMAXIO : NFS_V2MAXDATA)
#defineNFS64BITSSET0xull
#defineNFS64BITSMINUS1 0xfffeull
Modified: head/sys/fs/nfs/nfs_commonport.c
==
--- head/sys/fs/nfs/nfs_commonport.cThu Apr 16 22:34:10 2015
(r281627)
+++ head/sys/fs/nfs/nfs_commonport.cThu Apr 16 22:35:15 2015
(r281628)
@@ -281,11 +281,11 @@ nfsvno_getfs(struct nfsfsinfo *sip, int
if (isdgram)
pref = NFS_MAXDGRAMDATA;
else
- pref = NFS_MAXDATA;
- sip->fs_rtmax = NFS_MAXDATA;
+ pref = NFS_SRVMAXIO;
+ sip->fs_rtmax = NFS_SRVMAXIO;
sip->fs_rtpref = pref;
sip->fs_rtmult = NFS_FABLKSIZE;
- sip->fs_wtmax = NFS_MAXDATA;
+ sip->fs_wtmax = NFS_SRVMAXIO;
sip->fs_wtpref = pref;
sip->fs_wtmult = NFS_FABLKSIZE;
sip->fs_dtpref = pref;
Modified: head/sys/fs/nfs/nfsproto.h
==
--- head/sys/fs/nfs/nfsproto.h Thu Apr 16 22:34:10 2015(r281627)
+++ head/sys/fs/nfs/nfsproto.h Thu Apr 16 22:35:15 2015(r281628)
@@ -54,11 +54,10 @@
#defineNFS_VER44
#defineNFS_V2MAXDATA 8192
#defineNFS_MAXDGRAMDATA 16384
-#defineNFS_MAXDATA NFS_MAXBSIZE
#defineNFS_MAXPATHLEN 1024
#defineNFS_MAXNAMLEN 255
#defineNFS_MAXPKTHDR 404
-#defineNFS_MAXPACKET (NFS_MAXDATA + 2048)
+#defineNFS_MAXPACKET (NFS_SRVMAXIO + 2048)
#defineNFS_MINPACKET 20
#defineNFS_FABLKSIZE 512 /* Size in bytes of a block wrt
fa_blocks */
#defineNFSV4_MINORVERSION 0 /* V4 Minor version */
@@ -67,6 +66,18 @@
#defineNFSV41_CBVERS 4 /* V4.1 CB Version */
#defineNFSV4_SMALLSTR 50 /* Strings small enough for
stack */
+/*
+ * This value isn't a fixed value in the RFCs.
+ * It is the maximum data size supported by NFSv3 or NFSv4 over TCP for
+ * the server. It should be set to the I/O size preferred by ZFS or
+ * MAXBSIZE, whichever is greater.
+ * ZFS currently prefers 128K.
+ * It used to be called NFS_MAXDATA, but has been renamed to clarify that
+ * it refers to server side only and doesn't conflict with the NFS_MAXDATA
+ * defined in rpcsvc/nfs_prot.h for userland.
+ */
+#defineNFS_SRVMAXIO(128 * 1024)
+
/* Stat numbers for rpc returns (version 2, 3 and 4) */
/*
* These numbers are hard-wired in the RFCs, so they can't be changed.
Modified: head/sys/fs/nfsserver/nfs_nfsdserv.c
==
--- head/sys/fs/nfsserver/nfs_nfsdserv.cThu Apr 16 22:34:10 2015
(r281627)
+++ head/sys/fs/nfsserver/nfs_nfsdserv.cThu Apr 16 22:35:15 2015
(r281628)
@@ -881,7 +881,7 @@ nfsrvd_write(struct nfsrv_descript *nd,
i = mbuf_len(mp);
}
- if (retlen > NFS_MAXDATA || retlen < 0)
+ if (retlen > NFS_SRVMAXIO || retlen < 0)
nd->nd_repstat = EIO;
if (vnode_vtype(vp) != VREG && !nd->nd_repstat) {
if (nd->nd_flag & ND_NFSV3)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281629 - head
Author: emaste Date: Thu Apr 16 22:35:19 2015 New Revision: 281629 URL: https://svnweb.freebsd.org/changeset/base/281629 Log: Add arm64 to universe if binutils is available. arm64 relies on an external binutils port or package right now, because the in-tree linker from binutils 2.17.50 does not support arm64. Add arm64 to universe if the linker is available. If not output a message that arm64 is skipped. buildworld and buildkernel use the external binutils automatically, so it's sufficient to run 'pkg install aarch64-binutils' to build FreeBSD/arm64. Differential Revision:https://reviews.freebsd.org/D2302 Reviewed by: andrew, imp Sponsored by: The FreeBSD Foundation Modified: head/Makefile Modified: head/Makefile == --- head/Makefile Thu Apr 16 22:35:15 2015(r281628) +++ head/Makefile Thu Apr 16 22:35:19 2015(r281629) @@ -374,6 +374,17 @@ kernel-toolchains: # .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) TARGETS?=amd64 arm i386 mips pc98 powerpc sparc64 +# XXX Add arm64 to universe only if we have an external binutils installed. +# It does not build with the in-tree linnker. +.if exists(/usr/local/aarch64-freebsd/bin/ld) +TARGETS+=arm64 +TARGET_ARCHES_arm64?= aarch64 +.else +universe: universe_arm64_skip +universe_epilogue: universe_arm64_skip +universe_arm64_skip: universe_prologue + @echo ">> arm64 skipped - install aarch64-binutils port or package to build" +.endif TARGET_ARCHES_arm?=arm armeb armv6 armv6hf TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?=powerpc powerpc64 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281630 - head/sys/amd64/vmm
Author: neel Date: Thu Apr 16 22:44:51 2015 New Revision: 281630 URL: https://svnweb.freebsd.org/changeset/base/281630 Log: Relax the check on which vectors can be delivered through the APIC. According to the Intel SDM vectors 16 through 255 are allowed to be delivered via the local APIC. Reported by: Leon Dang (ld...@nahannisys.com) MFC after:2 weeks Modified: head/sys/amd64/vmm/vmm_lapic.c Modified: head/sys/amd64/vmm/vmm_lapic.c == --- head/sys/amd64/vmm/vmm_lapic.c Thu Apr 16 22:35:19 2015 (r281629) +++ head/sys/amd64/vmm/vmm_lapic.c Thu Apr 16 22:44:51 2015 (r281630) @@ -57,7 +57,11 @@ lapic_set_intr(struct vm *vm, int cpu, i if (cpu < 0 || cpu >= VM_MAXCPU) return (EINVAL); - if (vector < 32 || vector > 255) + /* +* According to section "Maskable Hardware Interrupts" in Intel SDM +* vectors 16 through 255 can be delivered through the local APIC. +*/ + if (vector < 16 || vector > 255) return (EINVAL); vlapic = vm_lapic(vm, cpu); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281639 - head/sys/arm/allwinner
Author: loos Date: Fri Apr 17 03:56:50 2015 New Revision: 281639 URL: https://svnweb.freebsd.org/changeset/base/281639 Log: Fix the 'wrong packet header' errors for if_emac. Do not strip the ethernet CRC until we read all data from FIFO, otherwise the CRC bytes would be left in FIFO causing the failure of next packet (wrong packet header). When this error happens the receiver has to be disabled and the RX FIFO flushed, discarding valid packets. With this fix if_emac behaves a lot better. Modified: head/sys/arm/allwinner/if_emac.c Modified: head/sys/arm/allwinner/if_emac.c == --- head/sys/arm/allwinner/if_emac.cFri Apr 17 01:51:05 2015 (r281638) +++ head/sys/arm/allwinner/if_emac.cFri Apr 17 03:56:50 2015 (r281639) @@ -358,15 +358,13 @@ emac_rxeof(struct emac_softc *sc, int co return; m->m_len = m->m_pkthdr.len = MCLBYTES; - len -= ETHER_CRC_LEN; - /* Copy entire frame to mbuf first. */ bus_space_read_multi_4(sc->emac_tag, sc->emac_handle, EMAC_RX_IO_DATA, mtod(m, uint32_t *), roundup2(len, 4) / 4); m->m_pkthdr.rcvif = ifp; - m->m_len = m->m_pkthdr.len = len; + m->m_len = m->m_pkthdr.len = len - ETHER_CRC_LEN; /* * Emac controller needs strict aligment, so to avoid ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281642 - head/sys/net/altq
Author: glebius
Date: Fri Apr 17 06:38:31 2015
New Revision: 281642
URL: https://svnweb.freebsd.org/changeset/base/281642
Log:
- Format copyright notices, VCS ids.
- Run through unifdef(1).
Deleted:
head/sys/net/altq/altqconf.h
Modified:
head/sys/net/altq/altq.h
head/sys/net/altq/altq_cbq.c
head/sys/net/altq/altq_cdnr.c
head/sys/net/altq/altq_classq.h
head/sys/net/altq/altq_hfsc.c
head/sys/net/altq/altq_priq.c
head/sys/net/altq/altq_red.c
head/sys/net/altq/altq_rio.c
head/sys/net/altq/altq_rmclass.c
head/sys/net/altq/altq_rmclass_debug.h
head/sys/net/altq/altq_subr.c
head/sys/net/altq/altq_var.h
head/sys/net/altq/if_altq.h
Modified: head/sys/net/altq/altq.h
==
--- head/sys/net/altq/altq.hFri Apr 17 05:58:11 2015(r281641)
+++ head/sys/net/altq/altq.hFri Apr 17 06:38:31 2015(r281642)
@@ -1,7 +1,4 @@
-/* $FreeBSD$ */
-/* $KAME: altq.h,v 1.10 2003/07/10 12:07:47 kjc Exp $ */
-
-/*
+/*-
* Copyright (C) 1998-2003
* Sony Computer Science Laboratories Inc. All rights reserved.
*
@@ -25,6 +22,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: altq.h,v 1.10 2003/07/10 12:07:47 kjc Exp $
+ * $FreeBSD$
*/
#ifndef _ALTQ_ALTQ_H_
#define_ALTQ_ALTQ_H_
Modified: head/sys/net/altq/altq_cbq.c
==
--- head/sys/net/altq/altq_cbq.cFri Apr 17 05:58:11 2015
(r281641)
+++ head/sys/net/altq/altq_cbq.cFri Apr 17 06:38:31 2015
(r281642)
@@ -1,7 +1,4 @@
-/* $FreeBSD$ */
-/* $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $ */
-
-/*
+/*-
* Copyright (c) Sun Microsystems, Inc. 1993-1998 All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -29,15 +26,14 @@
* provided "as is" without express or implied warranty of any kind.
*
* These notices must be retained in any copies of any part of this software.
+ *
+ * $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $
+ * $FreeBSD$
*/
-#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
#include "opt_inet.h"
-#ifdef __FreeBSD__
#include "opt_inet6.h"
-#endif
-#endif /* __FreeBSD__ || __NetBSD__ */
#ifdef ALTQ_CBQ/* cbq is enabled by ALTQ_CBQ option in opt_altq.h */
#include
@@ -251,11 +247,7 @@ cbq_pfattach(struct pf_altq *a)
if ((ifp = ifunit(a->ifname)) == NULL || a->altq_disc == NULL)
return (EINVAL);
-#ifdef __NetBSD__
s = splnet();
-#else
- s = splimp();
-#endif
error = altq_attach(&ifp->if_snd, ALTQT_CBQ, a->altq_disc,
cbq_enqueue, cbq_dequeue, cbq_request, NULL, NULL);
splx(s);
Modified: head/sys/net/altq/altq_cdnr.c
==
--- head/sys/net/altq/altq_cdnr.c Fri Apr 17 05:58:11 2015
(r281641)
+++ head/sys/net/altq/altq_cdnr.c Fri Apr 17 06:38:31 2015
(r281642)
@@ -1,7 +1,4 @@
-/* $FreeBSD$ */
-/* $KAME: altq_cdnr.c,v 1.15 2005/04/13 03:44:24 suz Exp $ */
-
-/*
+/*-
* Copyright (C) 1999-2002
* Sony Computer Science Laboratories Inc. All rights reserved.
*
@@ -25,15 +22,14 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: altq_cdnr.c,v 1.15 2005/04/13 03:44:24 suz Exp $
+ * $FreeBSD$
*/
-#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
#include "opt_inet.h"
-#ifdef __FreeBSD__
#include "opt_inet6.h"
-#endif
-#endif /* __FreeBSD__ || __NetBSD__ */
#include
#include
@@ -1272,11 +1268,7 @@ cdnrioctl(dev, cmd, addr, flag, p)
break;
}
-#ifdef __NetBSD__
s = splnet();
-#else
- s = splimp();
-#endif
switch (cmd) {
case CDNR_IF_ATTACH:
Modified: head/sys/net/altq/altq_classq.h
==
--- head/sys/net/altq/altq_classq.h Fri Apr 17 05:58:11 2015
(r281641)
+++ head/sys/net/altq/altq_classq.h Fri Apr 17 06:38:31 2015
(r281642)
@@ -1,6 +1,4 @@
-/* $KAME: altq_classq.h,v 1.6 2003/01/07 07:33:38 kjc Exp $*/
-
-/*
+/*-
* Copyright (c) 1991-1997 Regents of the University of California.
* All rights reserved.
*
@@ -31,6 +29,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: altq_classq.h,v 1.6 2003/01/07 07:33:38 kjc Exp $
+ * $FreeBSD$
*/
/*
* class queue definitions extracted from rm_class.h.
Modified: head/s
svn commit: r281643 - head/sys/net
Author: glebius Date: Fri Apr 17 06:39:15 2015 New Revision: 281643 URL: https://svnweb.freebsd.org/changeset/base/281643 Log: Bring in if_types.h from projects/ifnet, where types are defined in enum. Modified: head/sys/net/if_types.h Modified: head/sys/net/if_types.h == --- head/sys/net/if_types.h Fri Apr 17 06:38:31 2015(r281642) +++ head/sys/net/if_types.h Fri Apr 17 06:39:15 2015(r281643) @@ -42,211 +42,216 @@ * http://www.iana.org/assignments/smi-numbers */ -#defineIFT_OTHER 0x1 /* none of the following */ -#defineIFT_18220x2 /* old-style arpanet imp */ -#defineIFT_HDH1822 0x3 /* HDH arpanet imp */ -#defineIFT_X25DDN 0x4 /* x25 to imp */ -#defineIFT_X25 0x5 /* PDN X25 interface (RFC877) */ -#defineIFT_ETHER 0x6 /* Ethernet CSMA/CD */ -#defineIFT_ISO880230x7 /* CMSA/CD */ -#defineIFT_ISO880240x8 /* Token Bus */ -#defineIFT_ISO880250x9 /* Token Ring */ -#defineIFT_ISO880260xa /* MAN */ -#defineIFT_STARLAN 0xb -#defineIFT_P10 0xc /* Proteon 10MBit ring */ -#defineIFT_P80 0xd /* Proteon 80MBit ring */ -#defineIFT_HY 0xe /* Hyperchannel */ -#defineIFT_FDDI0xf -#defineIFT_LAPB0x10 -#defineIFT_SDLC0x11 -#defineIFT_T1 0x12 -#defineIFT_CEPT0x13/* E1 - european T1 */ -#defineIFT_ISDNBASIC 0x14 -#defineIFT_ISDNPRIMARY 0x15 -#defineIFT_PTPSERIAL 0x16/* Proprietary PTP serial */ -#defineIFT_PPP 0x17/* RFC 1331 */ -#defineIFT_LOOP0x18/* loopback */ -#defineIFT_EON 0x19/* ISO over IP */ -#defineIFT_XETHER 0x1a/* obsolete 3MB experimental ethernet */ -#defineIFT_NSIP0x1b/* XNS over IP */ -#defineIFT_SLIP0x1c/* IP over generic TTY */ -#defineIFT_ULTRA 0x1d/* Ultra Technologies */ -#defineIFT_DS3 0x1e/* Generic T3 */ -#defineIFT_SIP 0x1f/* SMDS */ -#defineIFT_FRELAY 0x20/* Frame Relay DTE only */ -#defineIFT_RS232 0x21 -#defineIFT_PARA0x22/* parallel-port */ -#defineIFT_ARCNET 0x23 -#defineIFT_ARCNETPLUS 0x24 -#defineIFT_ATM 0x25/* ATM cells */ -#defineIFT_MIOX25 0x26 -#defineIFT_SONET 0x27/* SONET or SDH */ -#defineIFT_X25PLE 0x28 -#defineIFT_ISO88022LLC 0x29 -#defineIFT_LOCALTALK 0x2a -#defineIFT_SMDSDXI 0x2b -#defineIFT_FRELAYDCE 0x2c/* Frame Relay DCE */ -#defineIFT_V35 0x2d -#defineIFT_HSSI0x2e -#defineIFT_HIPPI 0x2f -#defineIFT_MODEM 0x30/* Generic Modem */ -#defineIFT_AAL50x31/* AAL5 over ATM */ -#defineIFT_SONETPATH 0x32 -#defineIFT_SONETVT 0x33 -#defineIFT_SMDSICIP0x34/* SMDS InterCarrier Interface */ -#defineIFT_PROPVIRTUAL 0x35/* Proprietary Virtual/internal */ -#defineIFT_PROPMUX 0x36/* Proprietary Multiplexing */ -#defineIFT_IEEE80212 0x37 /* 100BaseVG */ -#defineIFT_FIBRECHANNEL 0x38 /* Fibre Channel */ -#defineIFT_HIPPIINTERFACE 0x39 /* HIPPI interfaces */ -#defineIFT_FRAMERELAYINTERCONNECT 0x3a /* Obsolete, use either 0x20 or 0x2c */ -#defineIFT_AFLANE8023 0x3b /* ATM Emulated LAN for 802.3 */ -#defineIFT_AFLANE8025 0x3c /* ATM Emulated LAN for 802.5 */ -#defineIFT_CCTEMUL0x3d /* ATM Emulated circuit */ -#defineIFT_FASTETHER 0x3e /* Fast Ethernet (100BaseT) */ -#defineIFT_ISDN 0x3f /* ISDN and X.25*/ -#defineIFT_V110x40 /* CCITT V.11/X.21 */ -#defineIFT_V360x41 /* CCITT V.36 */ -#defineIFT_G703AT64K 0x42 /* CCITT G703 at 64Kbps */ -#defineIFT_G703AT2MB 0x43 /* Obsolete see DS1-MIB */ -#defineIFT_QLLC 0x44 /* SNA QLLC */ -#defineIFT_FASTETHERFX0x45 /* Fast Ethernet (100BaseFX) */ -#defineIFT_CHANNEL0x46 /* channel */ -#defi
