svn commit: r241183 - head/sys/net
Author: thompsa
Date: Thu Oct 4 07:40:55 2012
New Revision: 241183
URL: http://svn.freebsd.org/changeset/base/241183
Log:
Remove the M_NOWAIT from bridge_rtable_init as it isn't needed. The function
return value is not even checked and could lead to a panic on a null
sc_rthash.
MFC after:2 weeks
Modified:
head/sys/net/if_bridge.c
Modified: head/sys/net/if_bridge.c
==
--- head/sys/net/if_bridge.cThu Oct 4 06:33:03 2012(r241182)
+++ head/sys/net/if_bridge.cThu Oct 4 07:40:55 2012(r241183)
@@ -270,7 +270,7 @@ static void bridge_rtflush(struct bridge
static int bridge_rtdaddr(struct bridge_softc *, const uint8_t *,
uint16_t);
-static int bridge_rtable_init(struct bridge_softc *);
+static voidbridge_rtable_init(struct bridge_softc *);
static voidbridge_rtable_fini(struct bridge_softc *);
static int bridge_rtnode_addr_cmp(const uint8_t *, const uint8_t *);
@@ -2736,24 +2736,19 @@ bridge_rtdelete(struct bridge_softc *sc,
*
* Initialize the route table for this bridge.
*/
-static int
+static void
bridge_rtable_init(struct bridge_softc *sc)
{
int i;
sc->sc_rthash = malloc(sizeof(*sc->sc_rthash) * BRIDGE_RTHASH_SIZE,
- M_DEVBUF, M_NOWAIT);
- if (sc->sc_rthash == NULL)
- return (ENOMEM);
+ M_DEVBUF, M_WAITOK);
for (i = 0; i < BRIDGE_RTHASH_SIZE; i++)
LIST_INIT(&sc->sc_rthash[i]);
sc->sc_rthash_key = arc4random();
-
LIST_INIT(&sc->sc_rtlist);
-
- return (0);
}
/*
___
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: r241185 - stable/9/bin/setfacl
Author: trasz
Date: Thu Oct 4 08:33:46 2012
New Revision: 241185
URL: http://svn.freebsd.org/changeset/base/241185
Log:
MFC r240084:
Make "setfacl -bd" an alias for "setfacl -k". Previously it would crash
on assert.
PR: bin/165807
Modified:
stable/9/bin/setfacl/setfacl.c
Directory Properties:
stable/9/bin/setfacl/ (props changed)
Modified: stable/9/bin/setfacl/setfacl.c
==
--- stable/9/bin/setfacl/setfacl.c Thu Oct 4 08:26:49 2012
(r241184)
+++ stable/9/bin/setfacl/setfacl.c Thu Oct 4 08:33:46 2012
(r241185)
@@ -264,6 +264,17 @@ main(int argc, char *argv[])
need_mask = 1;
break;
case OP_REMOVE_EXT:
+ /*
+* Don't try to call remove_ext() for empty
+* default ACL.
+*/
+ if (acl_type == ACL_TYPE_DEFAULT &&
+ acl_get_entry(acl, ACL_FIRST_ENTRY,
+ &unused_entry) == 0) {
+ local_error += remove_default(&acl,
+ file->filename);
+ break;
+ }
remove_ext(&acl, file->filename);
need_mask = 0;
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: r241186 - stable/9/bin/getfacl
Author: trasz Date: Thu Oct 4 08:43:49 2012 New Revision: 241186 URL: http://svn.freebsd.org/changeset/base/241186 Log: MFC r240085: In getfacl(1) manual page, mention where to read about the ACL syntax. PR submitter suggested adding it to acl(3) instead, but I don't think pointing ordinary users at section 3 is a good idea. PR: docs/162380 Modified: stable/9/bin/getfacl/getfacl.1 Directory Properties: stable/9/bin/getfacl/ (props changed) Modified: stable/9/bin/getfacl/getfacl.1 == --- stable/9/bin/getfacl/getfacl.1 Thu Oct 4 08:33:46 2012 (r241185) +++ stable/9/bin/getfacl/getfacl.1 Thu Oct 4 08:43:49 2012 (r241186) @@ -97,6 +97,10 @@ then reads a list of pathnames, each terminated by one newline character, from the standard input. .El +.Pp +For an explanation of the ACL syntax, see the +.Xr setfacl 1 +manual page. .Sh EXIT STATUS .Ex -std .Sh EXAMPLES ___ 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: r241187 - stable/9/bin/setfacl
Author: trasz
Date: Thu Oct 4 08:47:05 2012
New Revision: 241187
URL: http://svn.freebsd.org/changeset/base/241187
Log:
MFC r240087:
Fix an error in setfacl(1) that manifested like this:
# setfacl -m u:trasz:rwx x
# setfacl -m u:root:rwx x
# getfacl x
# file: x
# owner: root
# group: wheel
user::rw-
user:root:rwx
user:trasz:rwx
group::r--
mask::rwx
other::r--
# setfacl -m u:root:rwx x
setfacl: x: acl_calc_mask() failed: Invalid argument
setfacl: x: failed to set ACL mask
For NFSv4 ACLs, this sort of situation would result in duplicated
entries.
Modified:
stable/9/bin/setfacl/merge.c
Directory Properties:
stable/9/bin/setfacl/ (props changed)
Modified: stable/9/bin/setfacl/merge.c
==
--- stable/9/bin/setfacl/merge.cThu Oct 4 08:43:49 2012
(r241186)
+++ stable/9/bin/setfacl/merge.cThu Oct 4 08:47:05 2012
(r241187)
@@ -94,7 +94,7 @@ merge_acl(acl_t acl, acl_t *prev_acl, co
acl_tag_t tag, tag_new;
acl_entry_type_t entry_type, entry_type_new;
acl_flagset_t flagset;
- int entry_id, entry_id_new, have_entry, entry_number = 0;
+ int entry_id, entry_id_new, have_entry, had_entry, entry_number = 0;
int acl_brand, prev_acl_brand;
acl_get_brand_np(acl, &acl_brand);
@@ -116,6 +116,7 @@ merge_acl(acl_t acl, acl_t *prev_acl, co
while (acl_get_entry(acl, entry_id, &entry) == 1) {
entry_id = ACL_NEXT_ENTRY;
have_entry = 0;
+ had_entry = 0;
/* keep track of existing ACL_MASK entries */
if (acl_get_tag_type(entry, &tag) == -1)
@@ -187,7 +188,7 @@ merge_acl(acl_t acl, acl_t *prev_acl, co
err(1, "%s:
acl_set_flagset_np() failed",
filename);
}
- have_entry = 1;
+ had_entry = have_entry = 1;
break;
default:
/* should never be here */
@@ -197,7 +198,7 @@ merge_acl(acl_t acl, acl_t *prev_acl, co
}
/* if this entry has not been found, it must be new */
- if (have_entry == 0) {
+ if (had_entry == 0) {
/*
* NFSv4 ACL entries must be prepended to the ACL.
___
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: r241190 - head/sys/sys
Author: tijl Date: Thu Oct 4 08:53:05 2012 New Revision: 241190 URL: http://svn.freebsd.org/changeset/base/241190 Log: Define clang feature test macro __has_extension. It's used in stdatomic.h. Modified: head/sys/sys/cdefs.h Modified: head/sys/sys/cdefs.h == --- head/sys/sys/cdefs.hThu Oct 4 08:49:41 2012(r241189) +++ head/sys/sys/cdefs.hThu Oct 4 08:53:05 2012(r241190) @@ -675,6 +675,9 @@ #endif #endif +#ifndef__has_extension +#define__has_extension __has_feature +#endif #ifndef__has_feature #define__has_feature(x) 0 #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: r241189 - stable/9
Author: kib Date: Thu Oct 4 08:49:41 2012 New Revision: 241189 URL: http://svn.freebsd.org/changeset/base/241189 Log: MFC r241092: Add the UPDATING note about padlock rng support requiring the config change. Modified: stable/9/UPDATING (contents, props changed) Modified: stable/9/UPDATING == --- stable/9/UPDATING Thu Oct 4 08:49:04 2012(r241188) +++ stable/9/UPDATING Thu Oct 4 08:49:41 2012(r241189) @@ -9,6 +9,15 @@ handbook. Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. + +20120913: + The random(4) support for the VIA hardware random number + generator (`PADLOCK') is no longer enabled unconditionally. + Add the PADLOCK_RNG option in the custom kernel config if + needed. The GENERIC kernels on i386 and amd64 do include the + option, so the change only affects the custom kernel + configurations. + 20120727: The sparc64 ZFS loader has been changed to no longer try to auto- detect ZFS providers based on diskN aliases but now requires these ___ 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: r241188 - stable/9/bin/cp
Author: trasz Date: Thu Oct 4 08:49:04 2012 New Revision: 241188 URL: http://svn.freebsd.org/changeset/base/241188 Log: MFC r240088: Explicitly mention that "cp -p" copies ACLs. PR: docs/168962 Modified: stable/9/bin/cp/cp.1 Directory Properties: stable/9/bin/cp/ (props changed) Modified: stable/9/bin/cp/cp.1 == --- stable/9/bin/cp/cp.1Thu Oct 4 08:47:05 2012(r241187) +++ stable/9/bin/cp/cp.1Thu Oct 4 08:49:04 2012(r241188) @@ -32,7 +32,7 @@ .\"@(#)cp.18.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd January 17, 2010 +.Dd September 4, 2012 .Dt CP 1 .Os .Sh NAME @@ -164,7 +164,7 @@ Cause .Nm to preserve the following attributes of each source file in the copy: modification time, access time, -file flags, file mode, user ID, and group ID, as allowed by permissions. +file flags, file mode, ACL, user ID, and group ID, as allowed by permissions. .Pp If the user ID and group ID cannot be preserved, no error message is displayed and the exit value is not altered. ___ 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: r241184 - stable/9/bin/setfacl
Author: trasz
Date: Thu Oct 4 08:26:49 2012
New Revision: 241184
URL: http://svn.freebsd.org/changeset/base/241184
Log:
MFC r240083:
Make setfacl(1) behave properly in situations like "setfacl -kd".
Modified:
stable/9/bin/setfacl/setfacl.c
Directory Properties:
stable/9/bin/setfacl/ (props changed)
Modified: stable/9/bin/setfacl/setfacl.c
==
--- stable/9/bin/setfacl/setfacl.c Thu Oct 4 07:40:55 2012
(r241183)
+++ stable/9/bin/setfacl/setfacl.c Thu Oct 4 08:26:49 2012
(r241184)
@@ -73,6 +73,7 @@ main(int argc, char *argv[])
{
acl_t acl;
acl_type_t acl_type;
+ acl_entry_t unused_entry;
char filename[PATH_MAX];
int local_error, carried_error, ch, i, entry_number, ret;
int h_flag;
@@ -296,6 +297,20 @@ main(int argc, char *argv[])
}
}
+ /*
+* Don't try to set an empty default ACL; it will always fail.
+* Use acl_delete_def_file(3) instead.
+*/
+ if (acl_type == ACL_TYPE_DEFAULT &&
+ acl_get_entry(acl, ACL_FIRST_ENTRY, &unused_entry) == 0) {
+ if (acl_delete_def_file(file->filename) == -1) {
+ warn("%s: acl_delete_def_file() failed",
+ file->filename);
+ carried_error++;
+ }
+ continue;
+ }
+
/* don't bother setting the ACL if something is broken */
if (local_error) {
carried_error++;
___
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: r241191 - stable/8
Author: kib Date: Thu Oct 4 09:02:38 2012 New Revision: 241191 URL: http://svn.freebsd.org/changeset/base/241191 Log: MFC r241092: Add the UPDATING note about padlock rng support requiring the config change. Modified: stable/8/UPDATING (contents, props changed) Modified: stable/8/UPDATING == --- stable/8/UPDATING Thu Oct 4 08:53:05 2012(r241190) +++ stable/8/UPDATING Thu Oct 4 09:02:38 2012(r241191) @@ -15,6 +15,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20120913: + The random(4) support for the VIA hardware random number + generator (`PADLOCK') is no longer enabled unconditionally. + Add the PADLOCK_RNG option in the custom kernel config if + needed. The GENERIC kernels on i386 and amd64 do include the + option, so the change only affects the custom kernel + configurations. + 20120727: The sparc64 ZFS loader has been changed to no longer try to auto- detect ZFS providers based on diskN aliases but now requires these ___ 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: r241192 - in stable/9: . gnu/usr.bin/gdb gnu/usr.bin/gdb/arch/amd64 gnu/usr.bin/gdb/arch/arm gnu/usr.bin/gdb/arch/i386 gnu/usr.bin/gdb/arch/ia64 gnu/usr.bin/gdb/arch/mips gnu/usr.bin/gd...
Author: fjoe
Date: Thu Oct 4 09:49:53 2012
New Revision: 241192
URL: http://svn.freebsd.org/changeset/base/241192
Log:
MFC: r241002
Fix pseudo checksum calculation.
This fixes ipfilter w/ network controllers that implement only
partial rx csum offloading.
PR: 106438
Obtained from:upstream
Modified:
stable/9/Makefile.inc1
stable/9/gnu/usr.bin/gdb/Makefile.inc
stable/9/gnu/usr.bin/gdb/arch/amd64/Makefile
stable/9/gnu/usr.bin/gdb/arch/amd64/init.c
stable/9/gnu/usr.bin/gdb/arch/arm/Makefile
stable/9/gnu/usr.bin/gdb/arch/arm/init.c
stable/9/gnu/usr.bin/gdb/arch/i386/Makefile
stable/9/gnu/usr.bin/gdb/arch/i386/init.c
stable/9/gnu/usr.bin/gdb/arch/ia64/Makefile
stable/9/gnu/usr.bin/gdb/arch/ia64/init.c
stable/9/gnu/usr.bin/gdb/arch/mips/Makefile
stable/9/gnu/usr.bin/gdb/arch/mips/init.c
stable/9/gnu/usr.bin/gdb/arch/powerpc/Makefile
stable/9/gnu/usr.bin/gdb/arch/powerpc/init.c
stable/9/gnu/usr.bin/gdb/arch/powerpc64/Makefile
stable/9/gnu/usr.bin/gdb/arch/powerpc64/init.c
stable/9/kerberos5/usr.bin/kadmin/Makefile
stable/9/kerberos5/usr.sbin/ktutil/Makefile
stable/9/rescue/rescue/Makefile
stable/9/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
stable/9/sys/fs/ext2fs/ext2_bmap.c
stable/9/sys/fs/ext2fs/ext2_extern.h
stable/9/sys/fs/ext2fs/ext2_vnops.c
stable/9/usr.bin/grep/util.c
Directory Properties:
stable/9/ (props changed)
stable/9/sys/ (props changed)
Modified: stable/9/Makefile.inc1
==
--- stable/9/Makefile.inc1 Thu Oct 4 09:02:38 2012(r241191)
+++ stable/9/Makefile.inc1 Thu Oct 4 09:49:53 2012(r241192)
@@ -172,7 +172,11 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.$
.endif
WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
# /usr/games added for fortune which depend on strfile
+.if defined(NO_WORLDTMP)
+BPATH= ${PATH}
+.else
BPATH=
${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
+.endif
XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
Modified: stable/9/gnu/usr.bin/gdb/Makefile.inc
==
--- stable/9/gnu/usr.bin/gdb/Makefile.inc Thu Oct 4 09:02:38 2012
(r241191)
+++ stable/9/gnu/usr.bin/gdb/Makefile.inc Thu Oct 4 09:49:53 2012
(r241192)
@@ -45,6 +45,7 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config
CFLAGS+= -I${CNTRB_BU}/include
CFLAGS+= -I${CNTRB_GDB}/include
CFLAGS+= -I${CNTRB_BU}/bfd
+DEBUG_FLAGS= -g -O0
GENSRCS+= nm.h tm.h
Modified: stable/9/gnu/usr.bin/gdb/arch/amd64/Makefile
==
--- stable/9/gnu/usr.bin/gdb/arch/amd64/MakefileThu Oct 4 09:02:38
2012(r241191)
+++ stable/9/gnu/usr.bin/gdb/arch/amd64/MakefileThu Oct 4 09:49:53
2012(r241192)
@@ -5,7 +5,7 @@ GENSRCS+= xm.h
LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c
LIBSRCS+= amd64-nat.c amd64bsd-nat.c amd64fbsd-nat.c
.endif
-LIBSRCS+= solib.c solib-svr4.c
+LIBSRCS+= solib.c solib-svr4.c solib-legacy.c
LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \
i386fbsd-tdep-fixed.c i387-tdep.c
Modified: stable/9/gnu/usr.bin/gdb/arch/amd64/init.c
==
--- stable/9/gnu/usr.bin/gdb/arch/amd64/init.c Thu Oct 4 09:02:38 2012
(r241191)
+++ stable/9/gnu/usr.bin/gdb/arch/amd64/init.c Thu Oct 4 09:49:53 2012
(r241192)
@@ -12,6 +12,7 @@ extern initialize_file_ftype _initialize
extern initialize_file_ftype _initialize_corelow;
extern initialize_file_ftype _initialize_solib;
extern initialize_file_ftype _initialize_svr4_solib;
+extern initialize_file_ftype _initialize_svr4_lm;
extern initialize_file_ftype _initialize_ser_hardwire;
extern initialize_file_ftype _initialize_ser_pipe;
extern initialize_file_ftype _initialize_ser_tcp;
@@ -126,6 +127,7 @@ initialize_all_files (void)
_initialize_corelow ();
_initialize_solib ();
_initialize_svr4_solib ();
+ _initialize_svr4_lm ();
_initialize_ser_hardwire ();
_initialize_ser_pipe ();
_initialize_ser_tcp ();
Modified: stable/9/gnu/usr.bin/gdb/arch/arm/Makefile
==
--- stable/9/gnu/usr.bin/gdb/arch/arm/Makefile Thu Oct 4 09:02:38 2012
(r241191)
+++ stable/9/gnu/usr.bin/gdb/arch/arm/Makefile Thu Oct 4 09:49:53 2012
(r241192)
@@ -2,7 +2,7 @@
GENSRCS+= xm.h
LIBSRCS+= armfbsd-nat.c
-LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c
+LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c solib-legacy.c
.if !defined(GDB_CROSS_DEBUGGER)
LIBSRCS+= fbsd-threads.c
.endif
Modified: stable/9/gnu/usr.bin/gdb/arch/arm/init.c
===
svn commit: r241193 - in stable/9: . gnu/usr.bin/gdb gnu/usr.bin/gdb/arch/amd64 gnu/usr.bin/gdb/arch/arm gnu/usr.bin/gdb/arch/i386 gnu/usr.bin/gdb/arch/ia64 gnu/usr.bin/gdb/arch/mips gnu/usr.bin/gd...
Author: fjoe
Date: Thu Oct 4 09:53:59 2012
New Revision: 241193
URL: http://svn.freebsd.org/changeset/base/241193
Log:
Revert changes that ocassionally got into r241192.
Pointy hat to:me
Modified:
stable/9/Makefile.inc1
stable/9/gnu/usr.bin/gdb/Makefile.inc
stable/9/gnu/usr.bin/gdb/arch/amd64/Makefile
stable/9/gnu/usr.bin/gdb/arch/amd64/init.c
stable/9/gnu/usr.bin/gdb/arch/arm/Makefile
stable/9/gnu/usr.bin/gdb/arch/arm/init.c
stable/9/gnu/usr.bin/gdb/arch/i386/Makefile
stable/9/gnu/usr.bin/gdb/arch/i386/init.c
stable/9/gnu/usr.bin/gdb/arch/ia64/Makefile
stable/9/gnu/usr.bin/gdb/arch/ia64/init.c
stable/9/gnu/usr.bin/gdb/arch/mips/Makefile
stable/9/gnu/usr.bin/gdb/arch/mips/init.c
stable/9/gnu/usr.bin/gdb/arch/powerpc/Makefile
stable/9/gnu/usr.bin/gdb/arch/powerpc/init.c
stable/9/gnu/usr.bin/gdb/arch/powerpc64/Makefile
stable/9/gnu/usr.bin/gdb/arch/powerpc64/init.c
stable/9/kerberos5/usr.bin/kadmin/Makefile
stable/9/kerberos5/usr.sbin/ktutil/Makefile
stable/9/rescue/rescue/Makefile
stable/9/sys/fs/ext2fs/ext2_bmap.c
stable/9/sys/fs/ext2fs/ext2_extern.h
stable/9/sys/fs/ext2fs/ext2_vnops.c
stable/9/usr.bin/grep/util.c
Modified: stable/9/Makefile.inc1
==
--- stable/9/Makefile.inc1 Thu Oct 4 09:49:53 2012(r241192)
+++ stable/9/Makefile.inc1 Thu Oct 4 09:53:59 2012(r241193)
@@ -172,11 +172,7 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.$
.endif
WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
# /usr/games added for fortune which depend on strfile
-.if defined(NO_WORLDTMP)
-BPATH= ${PATH}
-.else
BPATH=
${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
-.endif
XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
Modified: stable/9/gnu/usr.bin/gdb/Makefile.inc
==
--- stable/9/gnu/usr.bin/gdb/Makefile.inc Thu Oct 4 09:49:53 2012
(r241192)
+++ stable/9/gnu/usr.bin/gdb/Makefile.inc Thu Oct 4 09:53:59 2012
(r241193)
@@ -45,7 +45,6 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config
CFLAGS+= -I${CNTRB_BU}/include
CFLAGS+= -I${CNTRB_GDB}/include
CFLAGS+= -I${CNTRB_BU}/bfd
-DEBUG_FLAGS= -g -O0
GENSRCS+= nm.h tm.h
Modified: stable/9/gnu/usr.bin/gdb/arch/amd64/Makefile
==
--- stable/9/gnu/usr.bin/gdb/arch/amd64/MakefileThu Oct 4 09:49:53
2012(r241192)
+++ stable/9/gnu/usr.bin/gdb/arch/amd64/MakefileThu Oct 4 09:53:59
2012(r241193)
@@ -5,7 +5,7 @@ GENSRCS+= xm.h
LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c
LIBSRCS+= amd64-nat.c amd64bsd-nat.c amd64fbsd-nat.c
.endif
-LIBSRCS+= solib.c solib-svr4.c solib-legacy.c
+LIBSRCS+= solib.c solib-svr4.c
LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \
i386fbsd-tdep-fixed.c i387-tdep.c
Modified: stable/9/gnu/usr.bin/gdb/arch/amd64/init.c
==
--- stable/9/gnu/usr.bin/gdb/arch/amd64/init.c Thu Oct 4 09:49:53 2012
(r241192)
+++ stable/9/gnu/usr.bin/gdb/arch/amd64/init.c Thu Oct 4 09:53:59 2012
(r241193)
@@ -12,7 +12,6 @@ extern initialize_file_ftype _initialize
extern initialize_file_ftype _initialize_corelow;
extern initialize_file_ftype _initialize_solib;
extern initialize_file_ftype _initialize_svr4_solib;
-extern initialize_file_ftype _initialize_svr4_lm;
extern initialize_file_ftype _initialize_ser_hardwire;
extern initialize_file_ftype _initialize_ser_pipe;
extern initialize_file_ftype _initialize_ser_tcp;
@@ -127,7 +126,6 @@ initialize_all_files (void)
_initialize_corelow ();
_initialize_solib ();
_initialize_svr4_solib ();
- _initialize_svr4_lm ();
_initialize_ser_hardwire ();
_initialize_ser_pipe ();
_initialize_ser_tcp ();
Modified: stable/9/gnu/usr.bin/gdb/arch/arm/Makefile
==
--- stable/9/gnu/usr.bin/gdb/arch/arm/Makefile Thu Oct 4 09:49:53 2012
(r241192)
+++ stable/9/gnu/usr.bin/gdb/arch/arm/Makefile Thu Oct 4 09:53:59 2012
(r241193)
@@ -2,7 +2,7 @@
GENSRCS+= xm.h
LIBSRCS+= armfbsd-nat.c
-LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c solib-legacy.c
+LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c
.if !defined(GDB_CROSS_DEBUGGER)
LIBSRCS+= fbsd-threads.c
.endif
Modified: stable/9/gnu/usr.bin/gdb/arch/arm/init.c
==
--- stable/9/gnu/usr.bin/gdb/arch/arm/init.cThu Oct 4 09:49:53 2012
(r241192)
+++ stable/9/gnu/usr.bin/gdb/arch/arm/init.cThu Oct 4 09:53:59 2012
(r241193)
@@ -10,7 +10,6 @
svn commit: r241194 - in stable/9/sys/fs: nfs nfsclient nfsserver
Author: rmacklem
Date: Thu Oct 4 12:43:45 2012
New Revision: 241194
URL: http://svn.freebsd.org/changeset/base/241194
Log:
MFC: r240720
Modify the NFSv4 client so that it can handle owner
and owner_group strings that consist entirely of
digits, interpreting them as the uid/gid number.
This change was needed since new (>= 3.3) Linux
servers reply with these strings by default.
This change is mandated by the rfc3530bis draft.
Reported on freebsd-stable@ under the Subject
heading "Problem with Linux >= 3.3 as NFSv4 server"
by Norbert Aschendorff on Aug. 20, 2012.
Modified:
stable/9/sys/fs/nfs/nfs.h
stable/9/sys/fs/nfs/nfs_commonacl.c
stable/9/sys/fs/nfs/nfs_commonsubs.c
stable/9/sys/fs/nfs/nfs_var.h
stable/9/sys/fs/nfsclient/nfs_clcomsubs.c
stable/9/sys/fs/nfsserver/nfs_nfsdport.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/dev/e1000/ (props changed)
stable/9/sys/dev/isp/ (props changed)
stable/9/sys/dev/ixgbe/ (props changed)
stable/9/sys/dev/puc/ (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/fs/ntfs/ (props changed)
stable/9/sys/modules/ (props changed)
Modified: stable/9/sys/fs/nfs/nfs.h
==
--- stable/9/sys/fs/nfs/nfs.h Thu Oct 4 09:53:59 2012(r241193)
+++ stable/9/sys/fs/nfs/nfs.h Thu Oct 4 12:43:45 2012(r241194)
@@ -559,6 +559,7 @@ struct nfsrv_descript {
#defineND_EXGSSINTEGRITY 0x0020
#defineND_EXGSSPRIVACY 0x0040
#defineND_INCRSEQID0x0080
+#defineND_NFSCL0x0100
/*
* ND_GSS should be the "or" of all GSS type authentications.
Modified: stable/9/sys/fs/nfs/nfs_commonacl.c
==
--- stable/9/sys/fs/nfs/nfs_commonacl.c Thu Oct 4 09:53:59 2012
(r241193)
+++ stable/9/sys/fs/nfs/nfs_commonacl.c Thu Oct 4 12:43:45 2012
(r241194)
@@ -101,12 +101,12 @@ nfsrv_dissectace(struct nfsrv_descript *
if (gotid == 0) {
if (flag & NFSV4ACE_IDENTIFIERGROUP) {
acep->ae_tag = ACL_GROUP;
- aceerr = nfsv4_strtogid(name, len, &gid, p);
+ aceerr = nfsv4_strtogid(nd, name, len, &gid, p);
if (aceerr == 0)
acep->ae_id = (uid_t)gid;
} else {
acep->ae_tag = ACL_USER;
- aceerr = nfsv4_strtouid(name, len, &uid, p);
+ aceerr = nfsv4_strtouid(nd, name, len, &uid, p);
if (aceerr == 0)
acep->ae_id = uid;
}
Modified: stable/9/sys/fs/nfs/nfs_commonsubs.c
==
--- stable/9/sys/fs/nfs/nfs_commonsubs.cThu Oct 4 09:53:59 2012
(r241193)
+++ stable/9/sys/fs/nfs/nfs_commonsubs.cThu Oct 4 12:43:45 2012
(r241194)
@@ -1401,12 +1401,12 @@ nfsv4_loadattr(struct nfsrv_descript *nd
}
if (compare) {
if (!(*retcmpp)) {
- if (nfsv4_strtouid(cp, j, &uid, p) ||
+ if (nfsv4_strtouid(nd, cp, j, &uid, p) ||
nap->na_uid != uid)
*retcmpp = NFSERR_NOTSAME;
}
} else if (nap != NULL) {
- if (nfsv4_strtouid(cp, j, &uid, p))
+ if (nfsv4_strtouid(nd, cp, j, &uid, p))
nap->na_uid = nfsrv_defaultuid;
else
nap->na_uid = uid;
@@ -1434,12 +1434,12 @@ nfsv4_loadattr(struct nfsrv_descript *nd
}
if (compare) {
if (!(*retcmpp)) {
- if (nfsv4_strtogid(cp, j, &gid, p) ||
+ if (nfsv4_strtogid(nd, cp, j, &gid, p) ||
nap->na_gid != gid
svn commit: r241195 - in head/sys/dev/ath/ath_hal: ar5416 ar9002
Author: adrian Date: Thu Oct 4 15:42:45 2012 New Revision: 241195 URL: http://svn.freebsd.org/changeset/base/241195 Log: Implement the quarter rate fractional channel programming for the AR5416 and AR9280, but leave it disabled by default. TL;DR: don't enable this code at all unless you go through the process of getting the NIC re-certified. This is purely to be used as a reference and NOT a certified solution by any stretch of the imagination. The background: The AR5112 RF synth right up to the AR5133 RF synth (used on the AR5416, derivative is used for the AR9130/AR9160) only implement down to 2.5MHz channel spacing in 5GHz. Ie, the RF synth is programmed in steps of 2.5MHz (or 5, 10, 20MHz.) So they can't represent the quarter rate channels in the 4.9GHz PSB (which end in xxx2MHz and xxx7MHz). They support fractional spacing in 2GHz (1MHz spacing) (or things wouldn't work, right?) So instead of doing this, the RF synth programming for the AR5112 and later code will round to the nearest available frequency. If all NICs were RF5112 or later, they'll inter-operate fine - they all program the same. (And for reference, only the latest revision of the RF5111 NICs do it, but the driver doesn't yet implement the programming.) However: * The AR5416 programming didn't at all implement the fractional synth work around as above; * The AR9280 programming actually programmed the accurate centre frequency and thus wouldn't inter-operate with the legacy NICs. So this patch: * Implements the 4.9GHz PSB fractional synth workaround, exactly as the RF5112 and later code does; * Adds a very dirty workaround from me to calculate the same channel centre "fudge" to the AR9280 code when operating on fractional frequencies in 5GHz. HOWEVER however: It is disabled by default. Since the HAL didn't implement this feature, it's highly unlikely that the AR5416 and AR928x has been tested in these centre frequencies. There's a lot of regulatory compliance testing required before a NIC can have this enabled - checking for centre frequency, for drift, for synth spurs, for distortion and spectral mask compliance. There's likely a lot of other things that need testing so please don't treat this as an exhaustive, authoritative list. There's a perfectly good process out there to get a NIC certified by your regulatory domain, please go and engage someone to do that for you and pay the relevant fees. If a company wishes to grab this work and certify existing 802.11n NICs for work in these bands then please be my guest. The AR9280 works fine on the correct fractional synth channels (49x2 and 49x7Mhz) so you don't need to get certification for that. But the 500KHz offset hack may have the above issues (spur, distortion, accuracy, etc) so you will need to get the NIC recertified. Please note that it's also CARD dependent. Just because the RF synth will behave correctly doesn't at all mean that the card design will also behave correctly. So no, I won't enable this by default if someone verifies a specific AR5416/AR9280 NIC works. Please don't ask. Tested: I used the following NICs to do basic interoperability testing at half and quarter rates. However, I only did very minimal spectrum analyser testing (mostly "am I about to blow things up" testing; not "certification ready" testing): * AR5212 + AR5112 synth * AR5413 + AR5413 synth * AR5416 + AR5113 synth * AR9280 Modified: head/sys/dev/ath/ath_hal/ar5416/ar2133.c head/sys/dev/ath/ath_hal/ar9002/ar9280.c Modified: head/sys/dev/ath/ath_hal/ar5416/ar2133.c == --- head/sys/dev/ath/ath_hal/ar5416/ar2133.cThu Oct 4 12:43:45 2012 (r241194) +++ head/sys/dev/ath/ath_hal/ar5416/ar2133.cThu Oct 4 15:42:45 2012 (r241195) @@ -163,6 +163,33 @@ ar2133SetChannel(struct ath_hal *ah, con OS_REG_WRITE(ah, AR_PHY_CCK_TX_CTRL, txctl &~ AR_PHY_CCK_TX_CTRL_JAPAN); } + /* +* Handle programming the RF synth for odd frequencies in the +* 4.9->5GHz range. This matches the programming from the +* later model 802.11abg RF synths. +* +* This interoperates on the quarter rate channels with the +* AR5112 and later RF synths. Please note that the synthesiser +* isn't able to completely accurately represent these frequencies +* (as the resolution in this reference is 2.5MHz) and thus it will +* be slightly "off centre." This matches the same slightly +* incorrect * centre frequency behaviour that the AR5112 and later +* channel selection code has. +* +* This is disabled because it hasn't been tested for regulatory +* compliance and neither have the NICs which
svn commit: r241196 - head/usr.sbin/jail
Author: jamie
Date: Thu Oct 4 18:59:46 2012
New Revision: 241196
URL: http://svn.freebsd.org/changeset/base/241196
Log:
Move properly to the next parameter when jailparam_init fails
(i.e. on an unknown parameter), to avoid freeing bogus pointers.
Modified:
head/usr.sbin/jail/config.c
Modified: head/usr.sbin/jail/config.c
==
--- head/usr.sbin/jail/config.c Thu Oct 4 15:42:45 2012(r241195)
+++ head/usr.sbin/jail/config.c Thu Oct 4 18:59:46 2012(r241196)
@@ -690,6 +690,7 @@ import_params(struct cfjail *j)
if (jailparam_init(jp, p->name) < 0) {
error = -1;
jail_warnx(j, "%s", jail_errmsg);
+ jp++;
continue;
}
if (TAILQ_EMPTY(&p->val))
___
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: r241197 - head/lib/libjail
Author: jamie
Date: Thu Oct 4 19:07:05 2012
New Revision: 241197
URL: http://svn.freebsd.org/changeset/base/241197
Log:
Fix some memory allocation errors:
* jail_setv will leak a parameter name if jailparam_import fails.
* jailparam_all loses the jailparam pointer on realloc error
(a clear freshman mistake).
* If jailparam_init fails, the caller doesn't need to jailparam_free
the buffer. That's not really clear, so set things to NULL allowing
jailparam_free to work without error (though it's still not required).
Modified:
head/lib/libjail/jail.c
Modified: head/lib/libjail/jail.c
==
--- head/lib/libjail/jail.c Thu Oct 4 18:59:46 2012(r241196)
+++ head/lib/libjail/jail.c Thu Oct 4 19:07:05 2012(r241197)
@@ -85,19 +85,22 @@ jail_setv(int flags, ...)
(void)va_arg(tap, char *);
va_end(tap);
jp = alloca(njp * sizeof(struct jailparam));
- for (njp = 0; (name = va_arg(ap, char *)) != NULL; njp++) {
+ for (njp = 0; (name = va_arg(ap, char *)) != NULL;) {
value = va_arg(ap, char *);
- if (jailparam_init(jp + njp, name) < 0 ||
- jailparam_import(jp + njp, value) < 0) {
- jailparam_free(jp, njp);
- va_end(ap);
- return (-1);
- }
+ if (jailparam_init(jp + njp, name) < 0)
+ goto error;
+ if (jailparam_import(jp + njp++, value) < 0)
+ goto error;
}
va_end(ap);
jid = jailparam_set(jp, njp, flags);
jailparam_free(jp, njp);
return (jid);
+
+ error:
+ jailparam_free(jp, njp);
+ va_end(ap);
+ return (-1);
}
/*
@@ -195,7 +198,7 @@ jail_getv(int flags, ...)
int
jailparam_all(struct jailparam **jpp)
{
- struct jailparam *jp;
+ struct jailparam *jp, *tjp;
size_t mlen1, mlen2, buflen;
int njp, nlist;
int mib1[CTL_MAXNAME], mib2[CTL_MAXNAME - 2];
@@ -242,11 +245,10 @@ jailparam_all(struct jailparam **jpp)
/* Add the parameter to the list */
if (njp >= nlist) {
nlist *= 2;
- jp = realloc(jp, nlist * sizeof(*jp));
- if (jp == NULL) {
- jailparam_free(jp, njp);
- return (-1);
- }
+ tjp = realloc(jp, nlist * sizeof(*jp));
+ if (tjp == NULL)
+ goto error;
+ jp = tjp;
}
if (jailparam_init(jp + njp, buf + sizeof(SJPARAM)) < 0)
goto error;
@@ -277,6 +279,8 @@ jailparam_init(struct jailparam *jp, con
}
if (jailparam_type(jp) < 0) {
jailparam_free(jp, 1);
+ jp->jp_name = NULL;
+ jp->jp_value = NULL;
return (-1);
}
return (0);
___
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: r241198 - head/usr.sbin/acpi/acpidump
Author: jhb
Date: Thu Oct 4 20:00:32 2012
New Revision: 241198
URL: http://svn.freebsd.org/changeset/base/241198
Log:
Display the matrix of inter-domain distances in the SLIT table. This is
used to complement the SRAT table on NUMA machines.
MFC after:1 week
Modified:
head/usr.sbin/acpi/acpidump/acpi.c
Modified: head/usr.sbin/acpi/acpidump/acpi.c
==
--- head/usr.sbin/acpi/acpidump/acpi.c Thu Oct 4 19:07:05 2012
(r241197)
+++ head/usr.sbin/acpi/acpidump/acpi.c Thu Oct 4 20:00:32 2012
(r241198)
@@ -63,6 +63,7 @@ static void acpi_handle_madt(ACPI_TABLE_
static voidacpi_handle_ecdt(ACPI_TABLE_HEADER *sdp);
static voidacpi_handle_hpet(ACPI_TABLE_HEADER *sdp);
static voidacpi_handle_mcfg(ACPI_TABLE_HEADER *sdp);
+static voidacpi_handle_slit(ACPI_TABLE_HEADER *sdp);
static voidacpi_print_srat_cpu(uint32_t apic_id, uint32_t proximity_domain,
uint32_t flags);
static voidacpi_print_srat_memory(ACPI_SRAT_MEM_AFFINITY *mp);
@@ -519,6 +520,33 @@ acpi_handle_mcfg(ACPI_TABLE_HEADER *sdp)
}
static void
+acpi_handle_slit(ACPI_TABLE_HEADER *sdp)
+{
+ ACPI_TABLE_SLIT *slit;
+ UINT64 i, j;
+
+ printf(BEGIN_COMMENT);
+ acpi_print_sdt(sdp);
+ slit = (ACPI_TABLE_SLIT *)sdp;
+ printf("\tLocality Count=%jd\n", slit->LocalityCount);
+ printf("\n\t ");
+ for (i = 0; i < slit->LocalityCount; i++)
+ printf(" %3jd", i);
+ printf("\n\t +");
+ for (i = 0; i < slit->LocalityCount; i++)
+ printf("");
+ printf("\n");
+ for (i = 0; i < slit->LocalityCount; i++) {
+ printf("\t %3jd |", i);
+ for (j = 0; j < slit->LocalityCount; j++)
+ printf(" %3d",
+ slit->Entry[i * slit->LocalityCount + j]);
+ printf("\n");
+ }
+ printf(END_COMMENT);
+}
+
+static void
acpi_print_srat_cpu(uint32_t apic_id, uint32_t proximity_domain,
uint32_t flags)
{
@@ -1092,6 +1120,8 @@ acpi_handle_rsdt(ACPI_TABLE_HEADER *rsdp
acpi_handle_ecdt(sdp);
else if (!memcmp(sdp->Signature, ACPI_SIG_MCFG, 4))
acpi_handle_mcfg(sdp);
+ else if (!memcmp(sdp->Signature, ACPI_SIG_SLIT, 4))
+ acpi_handle_slit(sdp);
else if (!memcmp(sdp->Signature, ACPI_SIG_SRAT, 4))
acpi_handle_srat(sdp);
else if (!memcmp(sdp->Signature, ACPI_SIG_TCPA, 4))
___
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: r241199 - in vendor/libpcap/dist: . Win32/Src doc net packaging pcap test tests
Author: delphij
Date: Thu Oct 4 21:07:56 2012
New Revision: 241199
URL: http://svn.freebsd.org/changeset/base/241199
Log:
Vendor import of libpcap 1.3.0.
Added:
vendor/libpcap/dist/pcap-canusb-linux.c
vendor/libpcap/dist/pcap-canusb-linux.h
vendor/libpcap/dist/tests/
- copied from r241197, vendor/libpcap/dist/test/
Deleted:
vendor/libpcap/dist/doc/
vendor/libpcap/dist/net/
vendor/libpcap/dist/test/
Modified:
vendor/libpcap/dist/CHANGES
vendor/libpcap/dist/CREDITS
vendor/libpcap/dist/Makefile.in
vendor/libpcap/dist/VERSION
vendor/libpcap/dist/Win32/Src/gai_strerror.c
vendor/libpcap/dist/config.h.in
vendor/libpcap/dist/configure
vendor/libpcap/dist/configure.in
vendor/libpcap/dist/gencode.c
vendor/libpcap/dist/gencode.h
vendor/libpcap/dist/optimize.c
vendor/libpcap/dist/packaging/pcap.spec.in
vendor/libpcap/dist/pcap-bpf.c
vendor/libpcap/dist/pcap-common.c
vendor/libpcap/dist/pcap-linux.c
vendor/libpcap/dist/pcap-netfilter-linux.c
vendor/libpcap/dist/pcap.c
vendor/libpcap/dist/pcap/bpf.h
Modified: vendor/libpcap/dist/CHANGES
==
--- vendor/libpcap/dist/CHANGES Thu Oct 4 20:00:32 2012(r241198)
+++ vendor/libpcap/dist/CHANGES Thu Oct 4 21:07:56 2012(r241199)
@@ -1,3 +1,22 @@
+Friday March 30, 2012. m...@sandelman.ca
+Summary for 1.3.0 libpcap release
+Handle DLT_PFSYNC in {FreeBSD, other *BSD+Mac OS X, other}.
+Linux: Don't fail if netfilter isn't enabled in the kernel.
+Add new link-layer type for NFC Forum LLCP.
+Put the CANUSB stuff into EXTRA_DIST, so it shows up in the release
tarball.
+Add LINKTYPE_NG40/DLT_NG40.
+Add DLT_MPEG_2_TS/LINKTYPE_MPEG_2_TS for MPEG-2 transport streams.
+[PATCH] Fix AIX-3.5 crash with read failure during stress
+AIX fixes.
+Introduce --disable-shared configure option.
+Added initial support for canusb devices.
+Include the pcap(3PCAP) additions as 1.2.1 changes.
+many updates to documentation: pcap.3pcap.in
+Improve 'inbound'/'outbound' capture filters under Linux.
+Note the cleanup of handling of new DLT_/LINKTYPE_ values.
+On Lion, don't build for PPC.
+For mac80211 devices we need to clean up monitor mode on exit.
+
Friday December 9, 2011. g...@alum.mit.edu.
Summary for 1.2.1 libpcap release
Update README file.
Modified: vendor/libpcap/dist/CREDITS
==
--- vendor/libpcap/dist/CREDITS Thu Oct 4 20:00:32 2012(r241198)
+++ vendor/libpcap/dist/CREDITS Thu Oct 4 21:07:56 2012(r241199)
@@ -34,6 +34,7 @@ Additional people who have contributed p
David Kaelbling
David Young
Dean Gaudet
+dhruv
Don Ebright
Dug Song
Dustin Spicuzza
Modified: vendor/libpcap/dist/Makefile.in
==
--- vendor/libpcap/dist/Makefile.in Thu Oct 4 20:00:32 2012
(r241198)
+++ vendor/libpcap/dist/Makefile.in Thu Oct 4 21:07:56 2012
(r241199)
@@ -82,7 +82,7 @@ YACC = @V_YACC@
@rm -f $@
$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
-PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @CAN_SRC@ @NETFILTER_SRC@
+PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @CAN_SRC@ @NETFILTER_SRC@
@CANUSB_SRC@
FSRC = fad-@V_FINDALLDEVS@.c
SSRC = @SSRC@
CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \
@@ -289,6 +289,8 @@ EXTRA_DIST = \
pcap-bt-linux.h \
pcap-can-linux.c \
pcap-can-linux.h \
+ pcap-canusb-linux.c \
+ pcap-canusb-linux.h \
pcap-config.in \
pcap-dag.c \
pcap-dag.h \
Modified: vendor/libpcap/dist/VERSION
==
--- vendor/libpcap/dist/VERSION Thu Oct 4 20:00:32 2012(r241198)
+++ vendor/libpcap/dist/VERSION Thu Oct 4 21:07:56 2012(r241199)
@@ -1 +1 @@
-1.2.1
+1.3.0
Modified: vendor/libpcap/dist/Win32/Src/gai_strerror.c
==
--- vendor/libpcap/dist/Win32/Src/gai_strerror.cThu Oct 4 20:00:32
2012(r241198)
+++ vendor/libpcap/dist/Win32/Src/gai_strerror.cThu Oct 4 21:07:56
2012(r241199)
@@ -80,4 +80,4 @@ WSAAPI gai_strerrorA(int ecode)
return "Unknown error";
}
-#endif /* gai_strerror */
+#endif /* gai_strerror */
\ No newline at end of file
Modified: vendor/libpcap/dist/config.h.in
==
--- vendor/libpcap/dist/config.h.in Thu Oct 4 20:00:32 2012
(r241198)
+++ vendor/libpcap/dist/config.h.in Thu Oc
Re: svn commit: r241198 - head/usr.sbin/acpi/acpidump
On Thursday, October 04, 2012 4:00:32 pm John Baldwin wrote: > Author: jhb > Date: Thu Oct 4 20:00:32 2012 > New Revision: 241198 > URL: http://svn.freebsd.org/changeset/base/241198 > > Log: > Display the matrix of inter-domain distances in the SLIT table. This is > used to complement the SRAT table on NUMA machines. A very simplistic example from a dual-socket Sandy-Bridge EP (I don't have a quad-socket box handy): /* SLIT: Length=48, Revision=1, Checksum=228, OEMID=A M I, OEM Table ID=AMI SLIT, OEM Revision=0x0, Creator ID=AMI., Creator Revision=0x0 Locality Count=2 0 1 + 0 | 10 21 1 | 21 10 */ -- John Baldwin ___ 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: r241200 - vendor/libpcap/1.3.0
Author: delphij Date: Thu Oct 4 21:08:46 2012 New Revision: 241200 URL: http://svn.freebsd.org/changeset/base/241200 Log: Tag libpcap 1.3.0. Added: vendor/libpcap/1.3.0/ - copied from r241199, vendor/libpcap/dist/ ___ 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: r241201 - in stable/8/sys/fs: nfs nfsclient
Author: rmacklem
Date: Thu Oct 4 21:55:37 2012
New Revision: 241201
URL: http://svn.freebsd.org/changeset/base/241201
Log:
MFC: r240289
Add a simple printf() based debug facility to the new nfs client.
Use it for a printf() that can be harmlessly generated for mmap()'d
files. It will be used extensively for the NFSv4.1 client.
Debugging printf()s are enabled by setting vfs.nfs.debuglevel to
a non-zero value. The higher the value, the more debugging printf()s.
Modified:
stable/8/sys/fs/nfs/nfs_commonport.c
stable/8/sys/fs/nfs/nfscl.h
stable/8/sys/fs/nfsclient/nfs_clrpcops.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/fs/ (props changed)
Modified: stable/8/sys/fs/nfs/nfs_commonport.c
==
--- stable/8/sys/fs/nfs/nfs_commonport.cThu Oct 4 21:08:46 2012
(r241200)
+++ stable/8/sys/fs/nfs/nfs_commonport.cThu Oct 4 21:55:37 2012
(r241201)
@@ -61,6 +61,7 @@ struct mount nfsv4root_mnt;
int newnfs_numnfsd = 0;
struct nfsstats newnfsstats;
int nfs_numnfscbd = 0;
+int nfscl_debuglevel = 0;
char nfsv4_callbackaddr[INET6_ADDRSTRLEN];
struct callout newnfsd_callout;
void (*nfsd_call_servertimer)(void) = NULL;
@@ -79,6 +80,8 @@ SYSCTL_INT(_vfs_newnfs, OID_AUTO, nfs4ac
SYSCTL_STRING(_vfs_newnfs, OID_AUTO, callback_addr, CTLFLAG_RW,
nfsv4_callbackaddr, sizeof(nfsv4_callbackaddr),
"NFSv4 callback addr for server to use");
+SYSCTL_INT(_vfs_newnfs, OID_AUTO, debuglevel, CTLFLAG_RW, &nfscl_debuglevel,
+0, "Debug level for new nfs client");
/*
* Defines for malloc
Modified: stable/8/sys/fs/nfs/nfscl.h
==
--- stable/8/sys/fs/nfs/nfscl.h Thu Oct 4 21:08:46 2012(r241200)
+++ stable/8/sys/fs/nfs/nfscl.h Thu Oct 4 21:55:37 2012(r241201)
@@ -68,4 +68,10 @@ struct nfsv4node {
#defineNFSSATTR_SIZENEG1 0x4
#defineNFSSATTR_SIZERDEV 0x8
+/* Use this macro for debug printfs. */
+#defineNFSCL_DEBUG(level, ...) do {
\
+ if (nfscl_debuglevel >= (level))\
+ printf(__VA_ARGS__);\
+ } while (0)
+
#endif /* _NFS_NFSCL_H */
Modified: stable/8/sys/fs/nfsclient/nfs_clrpcops.c
==
--- stable/8/sys/fs/nfsclient/nfs_clrpcops.cThu Oct 4 21:08:46 2012
(r241200)
+++ stable/8/sys/fs/nfsclient/nfs_clrpcops.cThu Oct 4 21:55:37 2012
(r241201)
@@ -56,6 +56,7 @@ extern u_int32_t newnfs_false, newnfs_tr
extern nfstype nfsv34_type[9];
extern int nfsrv_useacl;
extern char nfsv4_callbackaddr[INET6_ADDRSTRLEN];
+extern int nfscl_debuglevel;
NFSCLSTATEMUTEX;
int nfstest_outofseq = 0;
int nfscl_assumeposixlocks = 1;
@@ -1398,7 +1399,7 @@ nfsrpc_write(vnode_t vp, struct uio *uio
if (stateid.other[0] == 0 && stateid.other[1] == 0 &&
stateid.other[2] == 0) {
nostateid = 1;
- printf("stateid0 in write\n");
+ NFSCL_DEBUG(1, "stateid0 in write\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: r241203 - stable/8/games/fortune/datfiles
Author: dougb Date: Thu Oct 4 22:16:38 2012 New Revision: 241203 URL: http://svn.freebsd.org/changeset/base/241203 Log: MFC r238879: Add a couple of nice quotes from Edward Everett Hale Modified: stable/8/games/fortune/datfiles/fortunes Directory Properties: stable/8/games/fortune/ (props changed) Modified: stable/8/games/fortune/datfiles/fortunes == --- stable/8/games/fortune/datfiles/fortunesThu Oct 4 22:16:17 2012 (r241202) +++ stable/8/games/fortune/datfiles/fortunesThu Oct 4 22:16:38 2012 (r241203) @@ -22100,6 +22100,11 @@ planet. Tuna, chicken, sparrow-brains, e world that they like, but catnip is crack from home. -- Bill Cole % +I am only one, but I am one. I cannot do everything, but I can do +something. And I will not let what I cannot do interfere with what +I can do. + -- Edward Everett Hale, (1822 - 1909) +% I am professionally trained in computer science, which is to say (in all seriousness) that I am extremely poorly educated. -- Joseph Weizenbaum, "Computer Power and Human Reason" @@ -31413,6 +31418,10 @@ Look ere ye leap. % Look out! Behind you! % +Look up and not down, look forward and not back, look out and not in, +and lend a hand. + -- Edward Everett Hale, "Lowell Institute Lectures" (1869) +% Look, we play the Star Spangled Banner before every game. You want us to pay income taxes, too? -- Bill Veeck, Chicago White Sox ___ 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: r241202 - stable/9/games/fortune/datfiles
Author: dougb Date: Thu Oct 4 22:16:17 2012 New Revision: 241202 URL: http://svn.freebsd.org/changeset/base/241202 Log: MFC r238879: Add a couple of nice quotes from Edward Everett Hale Modified: stable/9/games/fortune/datfiles/fortunes Directory Properties: stable/9/games/fortune/ (props changed) Modified: stable/9/games/fortune/datfiles/fortunes == --- stable/9/games/fortune/datfiles/fortunesThu Oct 4 21:55:37 2012 (r241201) +++ stable/9/games/fortune/datfiles/fortunesThu Oct 4 22:16:17 2012 (r241202) @@ -22100,6 +22100,11 @@ planet. Tuna, chicken, sparrow-brains, e world that they like, but catnip is crack from home. -- Bill Cole % +I am only one, but I am one. I cannot do everything, but I can do +something. And I will not let what I cannot do interfere with what +I can do. + -- Edward Everett Hale, (1822 - 1909) +% I am professionally trained in computer science, which is to say (in all seriousness) that I am extremely poorly educated. -- Joseph Weizenbaum, "Computer Power and Human Reason" @@ -31413,6 +31418,10 @@ Look ere ye leap. % Look out! Behind you! % +Look up and not down, look forward and not back, look out and not in, +and lend a hand. + -- Edward Everett Hale, "Lowell Institute Lectures" (1869) +% Look, we play the Star Spangled Banner before every game. You want us to pay income taxes, too? -- Bill Veeck, Chicago White Sox ___ 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: r241204 - stable/7/games/fortune/datfiles
Author: dougb Date: Thu Oct 4 22:16:58 2012 New Revision: 241204 URL: http://svn.freebsd.org/changeset/base/241204 Log: MFC r238879: Add a couple of nice quotes from Edward Everett Hale Modified: stable/7/games/fortune/datfiles/fortunes Directory Properties: stable/7/games/fortune/ (props changed) Modified: stable/7/games/fortune/datfiles/fortunes == --- stable/7/games/fortune/datfiles/fortunesThu Oct 4 22:16:38 2012 (r241203) +++ stable/7/games/fortune/datfiles/fortunesThu Oct 4 22:16:58 2012 (r241204) @@ -22100,6 +22100,11 @@ planet. Tuna, chicken, sparrow-brains, e world that they like, but catnip is crack from home. -- Bill Cole % +I am only one, but I am one. I cannot do everything, but I can do +something. And I will not let what I cannot do interfere with what +I can do. + -- Edward Everett Hale, (1822 - 1909) +% I am professionally trained in computer science, which is to say (in all seriousness) that I am extremely poorly educated. -- Joseph Weizenbaum, "Computer Power and Human Reason" @@ -31413,6 +31418,10 @@ Look ere ye leap. % Look out! Behind you! % +Look up and not down, look forward and not back, look out and not in, +and lend a hand. + -- Edward Everett Hale, "Lowell Institute Lectures" (1869) +% Look, we play the Star Spangled Banner before every game. You want us to pay income taxes, too? -- Bill Veeck, Chicago White Sox ___ 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: r241206 - stable/8/libexec/save-entropy
Author: dougb
Date: Thu Oct 4 22:23:57 2012
New Revision: 241206
URL: http://svn.freebsd.org/changeset/base/241206
Log:
MFC r240090:
Improve file rotation
Modified:
stable/8/libexec/save-entropy/save-entropy.sh
Directory Properties:
stable/8/libexec/save-entropy/ (props changed)
Modified: stable/8/libexec/save-entropy/save-entropy.sh
==
--- stable/8/libexec/save-entropy/save-entropy.sh Thu Oct 4 22:23:40
2012(r241205)
+++ stable/8/libexec/save-entropy/save-entropy.sh Thu Oct 4 22:23:57
2012(r241206)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2001-2006 Douglas Barton, do...@freebsd.org
+# Copyright (c) 2001-2006,2012 Douglas Barton, do...@freebsd.org
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
# This script is called by cron to store bits of randomness which are
# then used to seed /dev/random on boot.
-# Originally developed by Doug Barton, do...@freebsd.org
+# Originally developed by Doug Barton, do...@freebsd.org
PATH=/bin:/usr/bin
@@ -55,38 +55,36 @@ entropy_save_sz=${entropy_save_sz:-2048}
entropy_save_num=${entropy_save_num:-8}
if [ ! -d "${entropy_dir}" ]; then
- umask 077
- mkdir "${entropy_dir}" || {
- logger -is -t "$0" The entropy directory "${entropy_dir}" does not \
-exist, and cannot be created. Therefore no entropy can be saved. ;
- exit 1;}
- /usr/sbin/chown operator:operator "${entropy_dir}"
- chmod 0700 "${entropy_dir}"
+ install -d -o operator -g operator -m 0700 "${entropy_dir}" || {
+ logger -is -t "$0" The entropy directory "${entropy_dir}" does \
+ not exist, and cannot be created. Therefore no entropy can \
+ be saved.; exit 1; }
fi
+cd "${entropy_dir}" || {
+ logger -is -t "$0" Cannot cd to the entropy directory:
"${entropy_dir}". \
+ Entropy file rotation is aborted.; exit 1; }
+
+for f in saved-entropy.*; do
+ case "${f}" in saved-entropy.\*) continue ;; esac # No files match
+ [ ${f#saved-entropy\.} -ge ${entropy_save_num} ] && unlink ${f}
+done
+
umask 377
-esn_m1=$(( ${entropy_save_num} - 1 ))
-for file_num in `jot $esn_m1 $esn_m1 1`; do
- if [ -e "${entropy_dir}/saved-entropy.${file_num}" ]; then
- if [ -f "${entropy_dir}/saved-entropy.${file_num}" ]; then
- new_file=saved-entropy.$(( $file_num + 1 ))
- if [ -e "${entropy_dir}/${new_file}" ]; then
- unlink ${entropy_dir}/${new_file}
- fi
- mv "${entropy_dir}/saved-entropy.${file_num}" \
- "${entropy_dir}/${new_file}"
- else
- logger -is -t "$0" \
-"${entropy_dir}/saved-entropy.${file_num} is not a regular file, and therefore
\
-it will not be rotated. Entropy file harvesting is aborted."
- exit 1
- fi
+n=$(( ${entropy_save_num} - 1 ))
+while [ ${n} -ge 1 ]; do
+ if [ -f "saved-entropy.${n}" ]; then
+ mv "saved-entropy.${n}" "saved-entropy.$(( ${n} + 1 ))"
+ elif [ -e "saved-entropy.${n}" -o -L "saved-entropy.${n}" ]; then
+ logger -is -t "$0" \
+ "${entropy_dir}/saved-entropy.${n}" is not a regular file, and so \
+ it will not be rotated. Entropy file rotation is aborted.
+ exit 1
fi
+ n=$(( ${n} - 1 ))
done
-dd if=/dev/random of="${entropy_dir}/saved-entropy.1" \
-bs="$entropy_save_sz" count=1 2> /dev/null
+dd if=/dev/random of=saved-entropy.1 bs=${entropy_save_sz} count=1 2>/dev/null
exit 0
-
___
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: r241207 - stable/7/libexec/save-entropy
Author: dougb
Date: Thu Oct 4 22:24:14 2012
New Revision: 241207
URL: http://svn.freebsd.org/changeset/base/241207
Log:
MFC r240090:
Improve file rotation
Modified:
stable/7/libexec/save-entropy/save-entropy.sh
Directory Properties:
stable/7/libexec/save-entropy/ (props changed)
Modified: stable/7/libexec/save-entropy/save-entropy.sh
==
--- stable/7/libexec/save-entropy/save-entropy.sh Thu Oct 4 22:23:57
2012(r241206)
+++ stable/7/libexec/save-entropy/save-entropy.sh Thu Oct 4 22:24:14
2012(r241207)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2001-2006 Douglas Barton, do...@freebsd.org
+# Copyright (c) 2001-2006,2012 Douglas Barton, do...@freebsd.org
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
# This script is called by cron to store bits of randomness which are
# then used to seed /dev/random on boot.
-# Originally developed by Doug Barton, do...@freebsd.org
+# Originally developed by Doug Barton, do...@freebsd.org
PATH=/bin:/usr/bin
@@ -55,38 +55,36 @@ entropy_save_sz=${entropy_save_sz:-2048}
entropy_save_num=${entropy_save_num:-8}
if [ ! -d "${entropy_dir}" ]; then
- umask 077
- mkdir "${entropy_dir}" || {
- logger -is -t "$0" The entropy directory "${entropy_dir}" does not \
-exist, and cannot be created. Therefore no entropy can be saved. ;
- exit 1;}
- /usr/sbin/chown operator:operator "${entropy_dir}"
- chmod 0700 "${entropy_dir}"
+ install -d -o operator -g operator -m 0700 "${entropy_dir}" || {
+ logger -is -t "$0" The entropy directory "${entropy_dir}" does \
+ not exist, and cannot be created. Therefore no entropy can \
+ be saved.; exit 1; }
fi
+cd "${entropy_dir}" || {
+ logger -is -t "$0" Cannot cd to the entropy directory:
"${entropy_dir}". \
+ Entropy file rotation is aborted.; exit 1; }
+
+for f in saved-entropy.*; do
+ case "${f}" in saved-entropy.\*) continue ;; esac # No files match
+ [ ${f#saved-entropy\.} -ge ${entropy_save_num} ] && unlink ${f}
+done
+
umask 377
-esn_m1=$(( ${entropy_save_num} - 1 ))
-for file_num in `jot $esn_m1 $esn_m1 1`; do
- if [ -e "${entropy_dir}/saved-entropy.${file_num}" ]; then
- if [ -f "${entropy_dir}/saved-entropy.${file_num}" ]; then
- new_file=saved-entropy.$(( $file_num + 1 ))
- if [ -e "${entropy_dir}/${new_file}" ]; then
- unlink ${entropy_dir}/${new_file}
- fi
- mv "${entropy_dir}/saved-entropy.${file_num}" \
- "${entropy_dir}/${new_file}"
- else
- logger -is -t "$0" \
-"${entropy_dir}/saved-entropy.${file_num} is not a regular file, and therefore
\
-it will not be rotated. Entropy file harvesting is aborted."
- exit 1
- fi
+n=$(( ${entropy_save_num} - 1 ))
+while [ ${n} -ge 1 ]; do
+ if [ -f "saved-entropy.${n}" ]; then
+ mv "saved-entropy.${n}" "saved-entropy.$(( ${n} + 1 ))"
+ elif [ -e "saved-entropy.${n}" -o -L "saved-entropy.${n}" ]; then
+ logger -is -t "$0" \
+ "${entropy_dir}/saved-entropy.${n}" is not a regular file, and so \
+ it will not be rotated. Entropy file rotation is aborted.
+ exit 1
fi
+ n=$(( ${n} - 1 ))
done
-dd if=/dev/random of="${entropy_dir}/saved-entropy.1" \
-bs="$entropy_save_sz" count=1 2> /dev/null
+dd if=/dev/random of=saved-entropy.1 bs=${entropy_save_sz} count=1 2>/dev/null
exit 0
-
___
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: r241205 - stable/9/libexec/save-entropy
Author: dougb
Date: Thu Oct 4 22:23:40 2012
New Revision: 241205
URL: http://svn.freebsd.org/changeset/base/241205
Log:
MFC r240090:
Improve file rotation
Modified:
stable/9/libexec/save-entropy/save-entropy.sh
Directory Properties:
stable/9/libexec/save-entropy/ (props changed)
Modified: stable/9/libexec/save-entropy/save-entropy.sh
==
--- stable/9/libexec/save-entropy/save-entropy.sh Thu Oct 4 22:16:58
2012(r241204)
+++ stable/9/libexec/save-entropy/save-entropy.sh Thu Oct 4 22:23:40
2012(r241205)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2001-2006 Douglas Barton, do...@freebsd.org
+# Copyright (c) 2001-2006,2012 Douglas Barton, do...@freebsd.org
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
# This script is called by cron to store bits of randomness which are
# then used to seed /dev/random on boot.
-# Originally developed by Doug Barton, do...@freebsd.org
+# Originally developed by Doug Barton, do...@freebsd.org
PATH=/bin:/usr/bin
@@ -55,38 +55,36 @@ entropy_save_sz=${entropy_save_sz:-2048}
entropy_save_num=${entropy_save_num:-8}
if [ ! -d "${entropy_dir}" ]; then
- umask 077
- mkdir "${entropy_dir}" || {
- logger -is -t "$0" The entropy directory "${entropy_dir}" does not \
-exist, and cannot be created. Therefore no entropy can be saved. ;
- exit 1;}
- /usr/sbin/chown operator:operator "${entropy_dir}"
- chmod 0700 "${entropy_dir}"
+ install -d -o operator -g operator -m 0700 "${entropy_dir}" || {
+ logger -is -t "$0" The entropy directory "${entropy_dir}" does \
+ not exist, and cannot be created. Therefore no entropy can \
+ be saved.; exit 1; }
fi
+cd "${entropy_dir}" || {
+ logger -is -t "$0" Cannot cd to the entropy directory:
"${entropy_dir}". \
+ Entropy file rotation is aborted.; exit 1; }
+
+for f in saved-entropy.*; do
+ case "${f}" in saved-entropy.\*) continue ;; esac # No files match
+ [ ${f#saved-entropy\.} -ge ${entropy_save_num} ] && unlink ${f}
+done
+
umask 377
-esn_m1=$(( ${entropy_save_num} - 1 ))
-for file_num in `jot $esn_m1 $esn_m1 1`; do
- if [ -e "${entropy_dir}/saved-entropy.${file_num}" ]; then
- if [ -f "${entropy_dir}/saved-entropy.${file_num}" ]; then
- new_file=saved-entropy.$(( $file_num + 1 ))
- if [ -e "${entropy_dir}/${new_file}" ]; then
- unlink ${entropy_dir}/${new_file}
- fi
- mv "${entropy_dir}/saved-entropy.${file_num}" \
- "${entropy_dir}/${new_file}"
- else
- logger -is -t "$0" \
-"${entropy_dir}/saved-entropy.${file_num} is not a regular file, and therefore
\
-it will not be rotated. Entropy file harvesting is aborted."
- exit 1
- fi
+n=$(( ${entropy_save_num} - 1 ))
+while [ ${n} -ge 1 ]; do
+ if [ -f "saved-entropy.${n}" ]; then
+ mv "saved-entropy.${n}" "saved-entropy.$(( ${n} + 1 ))"
+ elif [ -e "saved-entropy.${n}" -o -L "saved-entropy.${n}" ]; then
+ logger -is -t "$0" \
+ "${entropy_dir}/saved-entropy.${n}" is not a regular file, and so \
+ it will not be rotated. Entropy file rotation is aborted.
+ exit 1
fi
+ n=$(( ${n} - 1 ))
done
-dd if=/dev/random of="${entropy_dir}/saved-entropy.1" \
-bs="$entropy_save_sz" count=1 2> /dev/null
+dd if=/dev/random of=saved-entropy.1 bs=${entropy_save_sz} count=1 2>/dev/null
exit 0
-
___
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: r241208 - in stable/9/etc: . rc.d
Author: dougb
Date: Thu Oct 4 22:31:56 2012
New Revision: 241208
URL: http://svn.freebsd.org/changeset/base/241208
Log:
MFC r229822:
There is no longer a need to abstract ${rcvar_manpage} as we are not
attempting to maintain compatibility with NetBSD for some years now.
Modified:
stable/9/etc/rc.d/hostname
stable/9/etc/rc.subr
Directory Properties:
stable/9/etc/ (props changed)
Modified: stable/9/etc/rc.d/hostname
==
--- stable/9/etc/rc.d/hostname Thu Oct 4 22:24:14 2012(r241207)
+++ stable/9/etc/rc.d/hostname Thu Oct 4 22:31:56 2012(r241208)
@@ -65,7 +65,7 @@ hostname_start()
# Null hostname is probably OK if DHCP is in use.
#
if [ -z "`list_net_interfaces dhcp`" ]; then
- warn "\$hostname is not set -- see ${rcvar_manpage}."
+ warn "\$hostname is not set -- see rc.conf(5)."
fi
return
fi
Modified: stable/9/etc/rc.subr
==
--- stable/9/etc/rc.subrThu Oct 4 22:24:14 2012(r241207)
+++ stable/9/etc/rc.subrThu Oct 4 22:31:56 2012(r241208)
@@ -32,7 +32,6 @@
# functions used by various rc scripts
#
-: ${rcvar_manpage:='rc.conf(5)'}
: ${RC_PID:=$$}; export RC_PID
#
@@ -159,7 +158,7 @@ checkyesno()
return 1
;;
*)
- warn "\$${1} is not set properly - see ${rcvar_manpage}."
+ warn "\$${1} is not set properly - see rc.conf(5)."
return 1
;;
esac
___
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: r241209 - in stable/8/etc: . rc.d
Author: dougb
Date: Thu Oct 4 22:32:12 2012
New Revision: 241209
URL: http://svn.freebsd.org/changeset/base/241209
Log:
MFC r229822:
There is no longer a need to abstract ${rcvar_manpage} as we are not
attempting to maintain compatibility with NetBSD for some years now.
Modified:
stable/8/etc/rc.d/hostname
stable/8/etc/rc.subr
Directory Properties:
stable/8/etc/ (props changed)
Modified: stable/8/etc/rc.d/hostname
==
--- stable/8/etc/rc.d/hostname Thu Oct 4 22:31:56 2012(r241208)
+++ stable/8/etc/rc.d/hostname Thu Oct 4 22:32:12 2012(r241209)
@@ -65,7 +65,7 @@ hostname_start()
# Null hostname is probably OK if DHCP is in use.
#
if [ -z "`list_net_interfaces dhcp`" ]; then
- warn "\$hostname is not set -- see ${rcvar_manpage}."
+ warn "\$hostname is not set -- see rc.conf(5)."
fi
return
fi
Modified: stable/8/etc/rc.subr
==
--- stable/8/etc/rc.subrThu Oct 4 22:31:56 2012(r241208)
+++ stable/8/etc/rc.subrThu Oct 4 22:32:12 2012(r241209)
@@ -32,7 +32,6 @@
# functions used by various rc scripts
#
-: ${rcvar_manpage:='rc.conf(5)'}
: ${RC_PID:=$$}; export RC_PID
#
@@ -159,7 +158,7 @@ checkyesno()
return 1
;;
*)
- warn "\$${1} is not set properly - see ${rcvar_manpage}."
+ warn "\$${1} is not set properly - see rc.conf(5)."
return 1
;;
esac
___
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: r241210 - in stable/7/etc: . rc.d
Author: dougb
Date: Thu Oct 4 22:32:27 2012
New Revision: 241210
URL: http://svn.freebsd.org/changeset/base/241210
Log:
MFC r229822:
There is no longer a need to abstract ${rcvar_manpage} as we are not
attempting to maintain compatibility with NetBSD for some years now.
Modified:
stable/7/etc/rc.d/hostname
stable/7/etc/rc.subr
Directory Properties:
stable/7/etc/ (props changed)
Modified: stable/7/etc/rc.d/hostname
==
--- stable/7/etc/rc.d/hostname Thu Oct 4 22:32:12 2012(r241209)
+++ stable/7/etc/rc.d/hostname Thu Oct 4 22:32:27 2012(r241210)
@@ -65,7 +65,7 @@ hostname_start()
# Null hostname is probably OK if DHCP is in use.
#
if [ -z "`list_net_interfaces dhcp`" ]; then
- warn "\$hostname is not set -- see ${rcvar_manpage}."
+ warn "\$hostname is not set -- see rc.conf(5)."
fi
return
fi
Modified: stable/7/etc/rc.subr
==
--- stable/7/etc/rc.subrThu Oct 4 22:32:12 2012(r241209)
+++ stable/7/etc/rc.subrThu Oct 4 22:32:27 2012(r241210)
@@ -39,7 +39,6 @@
# functions used by various rc scripts
#
-: ${rcvar_manpage:='rc.conf(5)'}
: ${RC_PID:=$$}; export RC_PID
#
@@ -143,7 +142,7 @@ checkyesno()
return 1
;;
*)
- warn "\$${1} is not set properly - see ${rcvar_manpage}."
+ warn "\$${1} is not set properly - see rc.conf(5)."
return 1
;;
esac
___
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: r241211 - in vendor/tcpdump/dist: . tests win32/Include/Arpa win32/Include/Netinet
Author: delphij Date: Thu Oct 4 22:40:22 2012 New Revision: 241211 URL: http://svn.freebsd.org/changeset/base/241211 Log: Vendor import of tcpdump 4.3.0. Added: vendor/tcpdump/dist/print-tipc.c vendor/tcpdump/dist/tests/icmpv6.out vendor/tcpdump/dist/tests/icmpv6.pcap (contents, props changed) vendor/tcpdump/dist/tests/lmp.new vendor/tcpdump/dist/tests/pppoe.out vendor/tcpdump/dist/tests/pppoe.pcap (contents, props changed) Deleted: vendor/tcpdump/dist/tests/forces2.out vendor/tcpdump/dist/win32/Include/Arpa/ vendor/tcpdump/dist/win32/Include/Netinet/ Modified: vendor/tcpdump/dist/CHANGES vendor/tcpdump/dist/CREDITS vendor/tcpdump/dist/Makefile.in vendor/tcpdump/dist/VERSION vendor/tcpdump/dist/aclocal.m4 vendor/tcpdump/dist/configure vendor/tcpdump/dist/configure.in vendor/tcpdump/dist/decode_prefix.h vendor/tcpdump/dist/ethertype.h vendor/tcpdump/dist/forces.h vendor/tcpdump/dist/netdissect.h vendor/tcpdump/dist/print-802_11.c vendor/tcpdump/dist/print-bgp.c vendor/tcpdump/dist/print-ether.c vendor/tcpdump/dist/print-forces.c vendor/tcpdump/dist/print-icmp6.c vendor/tcpdump/dist/print-igmp.c vendor/tcpdump/dist/print-ip.c vendor/tcpdump/dist/print-ip6opts.c vendor/tcpdump/dist/print-ldp.c vendor/tcpdump/dist/print-lldp.c vendor/tcpdump/dist/print-lwapp.c vendor/tcpdump/dist/print-ospf6.c vendor/tcpdump/dist/print-pim.c vendor/tcpdump/dist/print-pppoe.c vendor/tcpdump/dist/print-rrcp.c vendor/tcpdump/dist/tcpdump.1.in vendor/tcpdump/dist/tcpdump.c vendor/tcpdump/dist/tests/TESTLIST vendor/tcpdump/dist/tests/TESTrun.sh vendor/tcpdump/dist/tests/forces1vvv.out vendor/tcpdump/dist/tests/forces1.out vendor/tcpdump/dist/tests/forces2v.out vendor/tcpdump/dist/tests/forces2vv.out Modified: vendor/tcpdump/dist/CHANGES == --- vendor/tcpdump/dist/CHANGES Thu Oct 4 22:32:27 2012(r241210) +++ vendor/tcpdump/dist/CHANGES Thu Oct 4 22:40:22 2012(r241211) @@ -1,3 +1,19 @@ +Friday April 3, 2011. m...@sandelman.ca. + Summary for 4.3.0 tcpdump release +fixes for forces: SPARSE data (per RFC 5810) +some more test cases added +updates to documentation on -l, -U and -w flags. +Fix printing of BGP optional headers. +Tried to include DLT_PFSYNC support, failed due to headers required. +added TIPC support. +Fix LLDP Network Policy bit definitions. +fixes for IGMPv3's Max Response Time: it is in units of 0.1 second. +SIGUSR1 can be used rather than SIGINFO for stats +permit -n flag to affect print-ip for protocol numbers +ND_OPT_ADVINTERVAL is in milliseconds, not seconds +Teach PPPoE parser about RFC 4638 + + Friday December 9, 2011. g...@alum.mit.edu. Summary for 4.2.1 tcpdump release Only build the Babel printer if IPv6 is enabled. Modified: vendor/tcpdump/dist/CREDITS == --- vendor/tcpdump/dist/CREDITS Thu Oct 4 22:32:27 2012(r241210) +++ vendor/tcpdump/dist/CREDITS Thu Oct 4 22:40:22 2012(r241211) @@ -43,6 +43,7 @@ Additional people who have contributed p Chris Larson Christian Sievers Christophe Rhodes +Cliff Frey Craig Rodrigues Crist J. Clark Daniel Hagerty @@ -102,6 +103,7 @@ Additional people who have contributed p Kelly Carmichael Ken Hornstein Kevin Steves +Kenichi Maehashi Klaus Klein Kris Kennaway Krzysztof Halasa @@ -176,6 +178,7 @@ Additional people who have contributed p Sepherosa Ziehau Seth Webster Shinsuke Suzuki +Simon Ruderich Steinar Haug Swaminathan Chandrasekaran Takashi Yamamoto Modified: vendor/tcpdump/dist/Makefile.in == --- vendor/tcpdump/dist/Makefile.in Thu Oct 4 22:32:27 2012 (r241210) +++ vendor/tcpdump/dist/Makefile.in Thu Oct 4 22:40:22 2012 (r241211) @@ -77,7 +77,7 @@ CSRC =addrtoname.c af.c checksum.c cpac print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c \ print-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c \ print-eap.c print-eigrp.c\ - print-esp.c print-ether.c print-fddi.c print-fr.c \ + print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c \ print-gre.c print-hsrp.c print-icmp.c print-igmp.c \ print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \ print-ipx
svn commit: r241212 - vendor/tcpdump/4.3.0
Author: delphij Date: Thu Oct 4 22:41:00 2012 New Revision: 241212 URL: http://svn.freebsd.org/changeset/base/241212 Log: Tag tcpdump 4.3.0. Added: vendor/tcpdump/4.3.0/ - copied from r241211, vendor/tcpdump/dist/ ___ 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: r241213 - stable/9/usr.bin/systat
Author: melifaro
Date: Thu Oct 4 22:56:15 2012
New Revision: 241213
URL: http://svn.freebsd.org/changeset/base/241213
Log:
Merge r240605.
Make systat(1) accept fractional number of seconds.
Make old alarm(3)-based code use select(2).
Modified:
stable/9/usr.bin/systat/cmds.c
stable/9/usr.bin/systat/extern.h
stable/9/usr.bin/systat/icmp.c
stable/9/usr.bin/systat/icmp6.c
stable/9/usr.bin/systat/ip.c
stable/9/usr.bin/systat/ip6.c
stable/9/usr.bin/systat/keyboard.c
stable/9/usr.bin/systat/main.c
stable/9/usr.bin/systat/systat.1
stable/9/usr.bin/systat/tcp.c
Directory Properties:
stable/9/usr.bin/ (props changed)
stable/9/usr.bin/systat/ (props changed)
Modified: stable/9/usr.bin/systat/cmds.c
==
--- stable/9/usr.bin/systat/cmds.c Thu Oct 4 22:41:00 2012
(r241212)
+++ stable/9/usr.bin/systat/cmds.c Thu Oct 4 22:56:15 2012
(r241213)
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
static const char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/29/95";
#endif
+#include
+
#include
#include
#include
@@ -49,10 +51,9 @@ command(const char *cmd)
{
struct cmdtab *p;
char *cp, *tmpstr, *tmpstr1;
- int interval, omask;
+ double t;
tmpstr = tmpstr1 = strdup(cmd);
- omask = sigblock(sigmask(SIGALRM));
for (cp = tmpstr1; *cp && !isspace(*cp); cp++)
;
if (*cp)
@@ -68,7 +69,7 @@ command(const char *cmd)
goto done;
}
if (strcmp(tmpstr1, "stop") == 0) {
- alarm(0);
+ delay = 0;
mvaddstr(CMDLINE, 0, "Refresh disabled.");
clrtoeol();
goto done;
@@ -88,19 +89,23 @@ command(const char *cmd)
clrtoeol();
goto done;
}
- interval = atoi(tmpstr1);
- if (interval <= 0 &&
- (strcmp(tmpstr1, "start") == 0 || strcmp(tmpstr1, "interval") ==
0)) {
- interval = *cp ? atoi(cp) : naptime;
- if (interval <= 0) {
- error("%d: bad interval.", interval);
- goto done;
+ t = strtod(tmpstr1, NULL) * 100.0;
+ if (t > 0 && t < (double)UINT_MAX)
+ delay = (unsigned int)t;
+ if ((t <= 0 || t > (double)UINT_MAX) &&
+ (strcmp(tmpstr1, "start") == 0 ||
+ strcmp(tmpstr1, "interval") == 0)) {
+ if (*cp != '\0') {
+ t = strtod(cp, NULL) * 100.0;
+ if (t <= 0 || t >= (double)UINT_MAX) {
+ error("%d: bad interval.", (int)t);
+ goto done;
+ }
}
}
- if (interval > 0) {
- alarm(0);
- naptime = interval;
- display(0);
+ if (t > 0) {
+ delay = (unsigned int)t;
+ display();
status();
goto done;
}
@@ -112,7 +117,6 @@ command(const char *cmd)
if (p) {
if (curcmd == p)
goto done;
- alarm(0);
(*curcmd->c_close)(wnd);
curcmd->c_flags &= ~CF_INIT;
wnd = (*p->c_open)();
@@ -133,14 +137,13 @@ command(const char *cmd)
}
curcmd = p;
labels();
- display(0);
+ display();
status();
goto done;
}
if (curcmd->c_cmd == 0 || !(*curcmd->c_cmd)(tmpstr1, cp))
error("%s: Unknown command.", tmpstr1);
done:
- sigsetmask(omask);
free(tmpstr);
}
@@ -177,7 +180,7 @@ status(void)
{
error("Showing %s, refresh every %d seconds.",
- curcmd->c_name, naptime);
+ curcmd->c_name, delay / 100);
}
int
Modified: stable/9/usr.bin/systat/extern.h
==
--- stable/9/usr.bin/systat/extern.hThu Oct 4 22:41:00 2012
(r241212)
+++ stable/9/usr.bin/systat/extern.hThu Oct 4 22:56:15 2012
(r241213)
@@ -49,11 +49,12 @@ extern int CMDLINE;
extern int dk_ndrive;
extern int hz, stathz;
extern double hertz; /* sampling frequency for cp_time and dk_time */
-extern int naptime, col;
+extern int col;
extern int nhosts;
extern int nports;
extern int protos;
extern int verbose;
+extern unsigned intdelay;
struct inpcb;
@@ -87,7 +88,7 @@ intcmdnetstat(const char *, const char
struct cmdtab *lookup(const char *);
voidcommand(const char *);
voiddie(int);
-voiddisplay(int);
+voiddisplay(void);
int dkinit(void);
int dkcmd(char *, char *);
voiderror(const char *fmt, ...) __printflike(1, 2);
Modified: stable/9/usr.bin/systat/icmp.c
==
Re: svn commit: r240899 - head/sys/dev/ath
On Mon, Sep 24, 2012 at 1:35 PM, Adrian Chadd wrote: > Author: adrian > Date: Mon Sep 24 20:35:56 2012 > New Revision: 240899 > URL: http://svn.freebsd.org/changeset/base/240899 > > Log: > Migrate the ath(4) KTR logging to use an ATH_KTR() macro. > > This should eventually be unified with ATH_DEBUG() so I can get both > from one macro; that may take some time. > > Add some new probes for TX and TX completion. This commit broke the non-IEEE80211_SUPPORT_TDMA case. My attached patch fixes it by better unifying the IEEE80211_SUPPORT_TDMA and non-IEEE80211_SUPPORT_TDMA cases where it made sense (it could be further unified, but that might make things more convoluted). Thanks! -Garrett fix-if_ath_tx-non-IEEE80211_SUPPORT_TDMA.patch Description: Binary data ___ 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: r241214 - in head: . lib/clang/include
Author: jkim Date: Fri Oct 5 00:35:13 2012 New Revision: 241214 URL: http://svn.freebsd.org/changeset/base/241214 Log: Do not install incomplete unwind.h from clang. This header file was meant to be a wrapper for the canonical system header file. Unfortunately, we do not have one (yet) and some times it is causing weird failures when clang is used for building ports. More complete and correct file will come from libcxxrt in the future. Discussed with: dim, kib, theraven MFC after:1 week Modified: head/ObsoleteFiles.inc head/lib/clang/include/Makefile Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Thu Oct 4 22:56:15 2012(r241213) +++ head/ObsoleteFiles.inc Fri Oct 5 00:35:13 2012(r241214) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20121004: remove incomplete unwind.h +OLD_FILES+=usr/include/clang/3.2/unwind.h # 20120908: pf cleanup OLD_FILES+=usr/include/net/if_pflow.h # 20120816: new clang import which bumps version from 3.1 to 3.2 Modified: head/lib/clang/include/Makefile == --- head/lib/clang/include/Makefile Thu Oct 4 22:56:15 2012 (r241213) +++ head/lib/clang/include/Makefile Fri Oct 5 00:35:13 2012 (r241214) @@ -25,7 +25,6 @@ INCS= altivec.h \ popcntintrin.h \ smmintrin.h \ tmmintrin.h \ - unwind.h \ wmmintrin.h \ x86intrin.h \ xmmintrin.h \ ___ 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: r241215 - head/sys/dev/bge
Author: yongari
Date: Fri Oct 5 03:35:38 2012
New Revision: 241215
URL: http://svn.freebsd.org/changeset/base/241215
Log:
Don't touch EMAC Mode and TX/RX MAC Mode register when driver is
not running.
Modified:
head/sys/dev/bge/if_bge.c
Modified: head/sys/dev/bge/if_bge.c
==
--- head/sys/dev/bge/if_bge.c Fri Oct 5 00:35:13 2012(r241214)
+++ head/sys/dev/bge/if_bge.c Fri Oct 5 03:35:38 2012(r241215)
@@ -896,7 +896,10 @@ bge_miibus_statchg(device_t dev)
{
struct bge_softc *sc;
struct mii_data *mii;
+
sc = device_get_softc(dev);
+ if ((sc->bge_ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+ return;
mii = device_get_softc(sc->bge_miibus);
if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) ==
@@ -5054,11 +5057,11 @@ bge_init_locked(struct bge_softc *sc)
bge_writembx(sc, BGE_MBX_IRQ0_LO, 0);
}
- bge_ifmedia_upd_locked(ifp);
-
ifp->if_drv_flags |= IFF_DRV_RUNNING;
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+ bge_ifmedia_upd_locked(ifp);
+
callout_reset(&sc->bge_stat_ch, hz, bge_tick, sc);
}
___
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: r241216 - head/sys/dev/bge
Author: yongari
Date: Fri Oct 5 03:46:25 2012
New Revision: 241216
URL: http://svn.freebsd.org/changeset/base/241216
Log:
APE firmware touches EMAC Mode and TX/RX MAC Mode registers to keep
the MAC connected to the outside world. So keep the accesses
atomic.
Modified:
head/sys/dev/bge/if_bge.c
Modified: head/sys/dev/bge/if_bge.c
==
--- head/sys/dev/bge/if_bge.c Fri Oct 5 03:35:38 2012(r241215)
+++ head/sys/dev/bge/if_bge.c Fri Oct 5 03:46:25 2012(r241216)
@@ -896,6 +896,7 @@ bge_miibus_statchg(device_t dev)
{
struct bge_softc *sc;
struct mii_data *mii;
+ uint32_t mac_mode, rx_mode, tx_mode;
sc = device_get_softc(dev);
if ((sc->bge_ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
@@ -925,30 +926,39 @@ bge_miibus_statchg(device_t dev)
sc->bge_link = 0;
if (sc->bge_link == 0)
return;
- BGE_CLRBIT(sc, BGE_MAC_MODE, BGE_MACMODE_PORTMODE);
+
+ /*
+* APE firmware touches these registers to keep the MAC
+* connected to the outside world. Try to keep the
+* accesses atomic.
+*/
+
+ /* Set the port mode (MII/GMII) to match the link speed. */
+ mac_mode = CSR_READ_4(sc, BGE_MAC_MODE) &
+ ~(BGE_MACMODE_PORTMODE | BGE_MACMODE_HALF_DUPLEX);
+ tx_mode = CSR_READ_4(sc, BGE_TX_MODE);
+ rx_mode = CSR_READ_4(sc, BGE_RX_MODE);
+
if (IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_T ||
IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_SX)
- BGE_SETBIT(sc, BGE_MAC_MODE, BGE_PORTMODE_GMII);
+ mac_mode |= BGE_PORTMODE_GMII;
else
- BGE_SETBIT(sc, BGE_MAC_MODE, BGE_PORTMODE_MII);
+ mac_mode |= BGE_PORTMODE_MII;
+ /* Set MAC flow control behavior to match link flow control settings. */
+ tx_mode &= ~BGE_TXMODE_FLOWCTL_ENABLE;
+ rx_mode &= ~BGE_RXMODE_FLOWCTL_ENABLE;
if (IFM_OPTIONS(mii->mii_media_active & IFM_FDX) != 0) {
- BGE_CLRBIT(sc, BGE_MAC_MODE, BGE_MACMODE_HALF_DUPLEX);
- if ((IFM_OPTIONS(mii->mii_media_active) &
- IFM_ETH_TXPAUSE) != 0)
- BGE_SETBIT(sc, BGE_TX_MODE, BGE_TXMODE_FLOWCTL_ENABLE);
- else
- BGE_CLRBIT(sc, BGE_TX_MODE, BGE_TXMODE_FLOWCTL_ENABLE);
- if ((IFM_OPTIONS(mii->mii_media_active) &
- IFM_ETH_RXPAUSE) != 0)
- BGE_SETBIT(sc, BGE_RX_MODE, BGE_RXMODE_FLOWCTL_ENABLE);
- else
- BGE_CLRBIT(sc, BGE_RX_MODE, BGE_RXMODE_FLOWCTL_ENABLE);
- } else {
- BGE_SETBIT(sc, BGE_MAC_MODE, BGE_MACMODE_HALF_DUPLEX);
- BGE_CLRBIT(sc, BGE_TX_MODE, BGE_TXMODE_FLOWCTL_ENABLE);
- BGE_CLRBIT(sc, BGE_RX_MODE, BGE_RXMODE_FLOWCTL_ENABLE);
- }
+ if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_TXPAUSE) != 0)
+ tx_mode |= BGE_TXMODE_FLOWCTL_ENABLE;
+ if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_RXPAUSE) != 0)
+ rx_mode |= BGE_RXMODE_FLOWCTL_ENABLE;
+ } else
+ mac_mode |= BGE_MACMODE_HALF_DUPLEX;
+
+ CSR_WRITE_4(sc, BGE_MAC_MODE, mac_mode);
+ CSR_WRITE_4(sc, BGE_TX_MODE, tx_mode);
+ CSR_WRITE_4(sc, BGE_RX_MODE, rx_mode);
}
/*
___
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: r241217 - head/sys/mips/mips
Author: alc
Date: Fri Oct 5 04:35:20 2012
New Revision: 241217
URL: http://svn.freebsd.org/changeset/base/241217
Log:
Eliminate a stale and a duplicated comment.
Modified:
head/sys/mips/mips/pmap.c
Modified: head/sys/mips/mips/pmap.c
==
--- head/sys/mips/mips/pmap.c Fri Oct 5 03:46:25 2012(r241216)
+++ head/sys/mips/mips/pmap.c Fri Oct 5 04:35:20 2012(r241217)
@@ -1621,13 +1621,6 @@ retry:
return (pv);
}
-/*
- * If it is the first entry on the list, it is actually
- * in the header and we must copy the following entry up
- * to the header. Otherwise we must search the list for
- * the entry. In either case we free the now unused entry.
- */
-
static pv_entry_t
pmap_pvh_remove(struct md_page *pvh, pmap_t pmap, vm_offset_t va)
{
@@ -2945,13 +2938,6 @@ pmap_clear_reference(vm_page_t m)
* address space. Return a pointer to where it is mapped. This
* routine is intended to be used for mapping device memory,
* NOT real memory.
- */
-
-/*
- * 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.
*
* Use XKPHYS uncached for 64 bit, and KSEG1 where possible for 32 bit.
*/
___
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: r241218 - head/usr.sbin/mergemaster
Author: dougb
Date: Fri Oct 5 05:01:42 2012
New Revision: 241218
URL: http://svn.freebsd.org/changeset/base/241218
Log:
Remove references to CVS so that people will stop bringing it up
For -p:
The localtime update should have been excluded in the first place
The make.conf comparison has been OBE for some time now, and there
is no src.conf equivalent to share/examples/make.conf, so remove
the whole thing.
Update copyright
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==
--- head/usr.sbin/mergemaster/mergemaster.shFri Oct 5 04:35:20 2012
(r241217)
+++ head/usr.sbin/mergemaster/mergemaster.shFri Oct 5 05:01:42 2012
(r241218)
@@ -5,8 +5,8 @@
# Compare files created by /usr/src/etc/Makefile (or the directory
# the user specifies) with the currently installed copies.
-# Copyright 1998-2011 Douglas Barton
-# do...@freebsd.org
+# Copyright (c) 1998-2012 Douglas Barton, All rights reserved
+# Please see detailed copyright below
# $FreeBSD$
@@ -532,9 +532,9 @@ if [ -t 0 ]; then
esac
fi
-# Define what CVS $Id tag to look for to aid portability.
+# Define what $Id tag to look for to aid portability.
#
-CVS_ID_TAG=FreeBSD
+ID_TAG=FreeBSD
delete_temproot () {
rm -rf "${TEMPROOT}" 2>/dev/null
@@ -1095,17 +1095,17 @@ for COMPFILE in `find . -type f | sort`;
case "${STRICT}" in
'' | [Nn][Oo])
-# Compare CVS $Id's first so if the file hasn't been modified
+# Compare $Id's first so if the file hasn't been modified
# local changes will be ignored.
# If the files have the same $Id, delete the one in temproot so the
# user will have less to wade through if files are left to merge by hand.
#
-CVSID1=`grep "[$]${CVS_ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null`
-CVSID2=`grep "[$]${CVS_ID_TAG}:" ${COMPFILE} 2>/dev/null` || CVSID2=none
+ID1=`grep "[$]${ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null`
+ID2=`grep "[$]${ID_TAG}:" ${COMPFILE} 2>/dev/null` || ID2=none
-case "${CVSID2}" in
-"${CVSID1}")
- echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting"
+case "${ID2}" in
+"${ID1}")
+ echo " *** Temp ${COMPFILE} and installed have the same Id, deleting"
rm "${COMPFILE}"
;;
esac
@@ -1334,7 +1334,7 @@ case "${NEED_PWD_MKDB}" in
;;
esac
-if [ -e "${DESTDIR}/etc/localtime" ]; then # Ignore if TZ == UTC
+if [ -e "${DESTDIR}/etc/localtime" -a -z "${PRE_WORLD}" ]; then#
Ignore if TZ == UTC
echo ''
[ -n "${DESTDIR}" ] && tzs_args="-C ${DESTDIR}"
if [ -f "${DESTDIR}/var/db/zoneinfo" ]; then
@@ -1380,29 +1380,35 @@ case "${COMP_CONFS}" in
;;
esac
-case "${PRE_WORLD}" in
-'') ;;
-*)
- MAKE_CONF="${SOURCEDIR}/share/examples/etc/make.conf"
-
- (echo ''
- echo '*** Comparing make variables'
- echo ''
- echo "*** From ${DESTDIR}/etc/make.conf"
- echo "*** From ${MAKE_CONF}"
-
- for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`;
do
-echo ''
-grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf
-grep -w ^#${MAKE_VAR} ${MAKE_CONF} ||
- echo ' * No example variable with this name'
- done) | ${PAGER}
- ;;
-esac
-
if [ -n "${PRESERVE_FILES}" ]; then
find -d $PRESERVE_FILES_DIR -type d -empty -delete 2>/dev/null
rmdir $PRESERVE_FILES_DIR 2>/dev/null
fi
exit 0
+
+#~~~
+
+# Copyright (c) 1998-2012 Douglas Barton
+# 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.
___
svn commit: r241219 - head/sys/dev/bge
Author: yongari
Date: Fri Oct 5 06:24:22 2012
New Revision: 241219
URL: http://svn.freebsd.org/changeset/base/241219
Log:
Add 40 microseconds delay after updating EMAC Mode register as
recommended by Broadcom data sheet.
Modified:
head/sys/dev/bge/if_bge.c
Modified: head/sys/dev/bge/if_bge.c
==
--- head/sys/dev/bge/if_bge.c Fri Oct 5 05:01:42 2012(r241218)
+++ head/sys/dev/bge/if_bge.c Fri Oct 5 06:24:22 2012(r241219)
@@ -957,6 +957,7 @@ bge_miibus_statchg(device_t dev)
mac_mode |= BGE_MACMODE_HALF_DUPLEX;
CSR_WRITE_4(sc, BGE_MAC_MODE, mac_mode);
+ DELAY(40);
CSR_WRITE_4(sc, BGE_TX_MODE, tx_mode);
CSR_WRITE_4(sc, BGE_RX_MODE, rx_mode);
}
@@ -1434,6 +1435,7 @@ bge_chipinit(struct bge_softc *sc)
/* Clear the MAC control register */
CSR_WRITE_4(sc, BGE_MAC_MODE, 0);
+ DELAY(40);
/*
* Clear the MAC statistics block in the NIC's
@@ -2046,6 +2048,7 @@ bge_blockinit(struct bge_softc *sc)
/* Turn on DMA, clear stats */
CSR_WRITE_4(sc, BGE_MAC_MODE, val);
+ DELAY(40);
/* Set misc. local control, enable interrupts on attentions */
CSR_WRITE_4(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_INTR_ONATTN);
@@ -3752,6 +3755,7 @@ bge_reset(struct bge_softc *sc)
BGE_SETBIT(sc, BGE_MODE_CTL, BGE_MODECTL_STACKUP);
CSR_WRITE_4(sc, BGE_MAC_MODE, 0);
+ DELAY(40);
/*
* The 5704 in TBI mode apparently needs some special
@@ -5148,6 +5152,7 @@ bge_ifmedia_upd_locked(struct ifnet *ifp
BGE_SETBIT(sc, BGE_MAC_MODE,
BGE_MACMODE_HALF_DUPLEX);
}
+ DELAY(40);
break;
default:
return (EINVAL);
@@ -5623,9 +5628,11 @@ bge_link_upd(struct bge_softc *sc)
if (status & BGE_MACSTAT_TBI_PCS_SYNCHED) {
if (!sc->bge_link) {
sc->bge_link++;
- if (sc->bge_asicrev == BGE_ASICREV_BCM5704)
+ if (sc->bge_asicrev == BGE_ASICREV_BCM5704) {
BGE_CLRBIT(sc, BGE_MAC_MODE,
BGE_MACMODE_TBI_SEND_CFGS);
+ DELAY(40);
+ }
CSR_WRITE_4(sc, BGE_MAC_STS, 0x);
if (bootverbose)
if_printf(sc->bge_ifp, "link UP\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"
Re: svn commit: r240742 - head/sys/net
On Sep 20, 2012, at 1:05 PM, Gleb Smirnoff wrote:
> Author: glebius
> Date: Thu Sep 20 10:05:10 2012
> New Revision: 240742
> URL: http://svn.freebsd.org/changeset/base/240742
>
> Log:
> Convert lagg(4) to use if_transmit instead of if_start.
>
> In collaboration with: thompsa, sbruno, fabient
>
> Modified:
> head/sys/net/if_lagg.c
>
> Modified: head/sys/net/if_lagg.c
> ==
> --- head/sys/net/if_lagg.cThu Sep 20 09:52:57 2012(r240741)
> +++ head/sys/net/if_lagg.cThu Sep 20 10:05:10 2012(r240742)
> @@ -110,7 +110,8 @@ static intlagg_ether_cmdmulti(struct la
> staticint lagg_setflag(struct lagg_port *, int, int,
> int (*func)(struct ifnet *, int));
> staticint lagg_setflags(struct lagg_port *, int status);
> -static void lagg_start(struct ifnet *);
> +static int lagg_transmit(struct ifnet *, struct mbuf *);
> +static void lagg_qflush(struct ifnet *);
> static intlagg_media_change(struct ifnet *);
> static void lagg_media_status(struct ifnet *, struct ifmediareq *);
> static struct lagg_port *lagg_link_active(struct lagg_softc *,
> @@ -312,15 +313,12 @@ lagg_clone_create(struct if_clone *ifc,
>
> if_initname(ifp, ifc->ifc_name, unit);
> ifp->if_softc = sc;
> - ifp->if_start = lagg_start;
> + ifp->if_transmit = lagg_transmit;
> + ifp->if_qflush = lagg_qflush;
> ifp->if_init = lagg_init;
> ifp->if_ioctl = lagg_ioctl;
> ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
>
> - IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
> - ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
> - IFQ_SET_READY(&ifp->if_snd);
> -
> /*
>* Attach as an ordinary ethernet device, children will be attached
>* as special device IFT_IEEE8023ADLAG.
> @@ -1222,35 +1220,45 @@ lagg_setflags(struct lagg_port *lp, int
> return (0);
> }
>
> -static void
> -lagg_start(struct ifnet *ifp)
> +static int
> +lagg_transmit(struct ifnet *ifp, struct mbuf *m)
> {
> struct lagg_softc *sc = (struct lagg_softc *)ifp->if_softc;
> - struct mbuf *m;
> - int error = 0;
> + int error, len, mcast;
> +
> + len = m->m_pkthdr.len;
> + mcast = (m->m_flags & (M_MCAST | M_BCAST)) ? 1 : 0;
>
> LAGG_RLOCK(sc);
> /* We need a Tx algorithm and at least one port */
> if (sc->sc_proto == LAGG_PROTO_NONE || sc->sc_count == 0) {
> - IF_DRAIN(&ifp->if_snd);
> LAGG_RUNLOCK(sc);
> - return;
> + m_freem(m);
> + ifp->if_oerrors++;
> + return (ENXIO);
> }
>
> - for (;; error = 0) {
> - IFQ_DEQUEUE(&ifp->if_snd, m);
> - if (m == NULL)
> - break;
> + ETHER_BPF_MTAP(ifp, m);
>
> - ETHER_BPF_MTAP(ifp, m);
> -
> - error = (*sc->sc_start)(sc, m);
> - if (error == 0)
> - ifp->if_opackets++;
> - else
> - ifp->if_oerrors++;
> - }
> + error = (*sc->sc_start)(sc, m);
> LAGG_RUNLOCK(sc);
> +
> + if (error == 0) {
> + ifp->if_opackets++;
> + ifp->if_omcasts += mcast;
> + ifp->if_obytes += len;
> + } else
> + ifp->if_oerrors++;
> +
> + return (error);
> +}
> +
> +/*
> + * The ifp->if_qflush entry point for lagg(4) is no-op.
> + */
> +static void
> +lagg_qflush(struct ifnet *ifp __unused)
> +{
> }
>
> static struct mbuf *
> ___
> 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"
Hi,
Are there any plans to MFC this change and the one for if_bridge?
This one applies cleanly on RELENG_9 and I will have the opportunity to test it
later today.
Regards,
Nikolay___
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"
