CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: zafer
Date: Sat Aug 11 20:16:21 UTC 2018
Modified Files:
src/sys/ufs/lfs: lfs_vnops.c
Log Message:
In lfs_mkdir fix wrong return path in case of EMLINK which causes a panic.
Also, check earlier before setting up dirop.
To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/sys/ufs/lfs/lfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.321 src/sys/ufs/lfs/lfs_vnops.c:1.322
--- src/sys/ufs/lfs/lfs_vnops.c:1.321 Sun Aug 20 05:37:03 2017
+++ src/sys/ufs/lfs/lfs_vnops.c Sat Aug 11 20:16:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.321 2017/08/20 05:37:03 maya Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.322 2018/08/11 20:16:21 zafer Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.321 2017/08/20 05:37:03 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.322 2018/08/11 20:16:21 zafer Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -959,6 +959,11 @@ lfs_mkdir(void *v)
if (fs->lfs_ronly) {
return EROFS;
}
+
+ if ((nlink_t)dp->i_nlink >= LINK_MAX) {
+ return EMLINK;
+ }
+
dirblksiz = fs->um_dirblksiz;
/* XXX dholland 20150911 I believe this to be true, but... */
//KASSERT(dirblksiz == LFS_DIRBLKSIZ);
@@ -967,11 +972,6 @@ lfs_mkdir(void *v)
if (error)
return error;
- if ((nlink_t)dp->i_nlink >= LINK_MAX) {
- error = EMLINK;
- goto out;
- }
-
/*
* Must simulate part of lfs_makeinode here to acquire the inode,
* but not have it entered in the parent directory. The entry is
CVS commit: src/sbin/fsck_lfs
Module Name:src Committed By: zafer Date: Tue Jun 12 20:12:22 UTC 2018 Modified Files: src/sbin/fsck_lfs: lfs.c Log Message: Remove duplicate assignments. Fixes PR bin/51512 by Jose Luis Rodriguez Garcia To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sbin/fsck_lfs/lfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck_lfs/lfs.c diff -u src/sbin/fsck_lfs/lfs.c:1.73 src/sbin/fsck_lfs/lfs.c:1.74 --- src/sbin/fsck_lfs/lfs.c:1.73 Sat Jun 10 08:13:15 2017 +++ src/sbin/fsck_lfs/lfs.c Tue Jun 12 20:12:21 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs.c,v 1.73 2017/06/10 08:13:15 pgoyette Exp $ */ +/* $NetBSD: lfs.c,v 1.74 2018/06/12 20:12:21 zafer Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. * All rights reserved. @@ -363,9 +363,7 @@ lfs_raw_vget(struct lfs * fs, ino_t ino, ip->inode_ext.lfs = ecalloc(1, sizeof(*ip->inode_ext.lfs)); vp->v_data = ip; /* ip->i_vnode = vp; */ - ip->i_number = ino; ip->i_lockf = 0; - ip->i_lfs_effnblks = 0; ip->i_state = 0; /* Load inode block and find inode */
CVS commit: src/usr.sbin/user
Module Name:src
Committed By: zafer
Date: Sun Jun 10 07:52:05 UTC 2018
Modified Files:
src/usr.sbin/user: user.c
Log Message:
Set default homeperm values before writing usermgmt.conf file and honor values
in it instead of ignoring it.
Fixes PR bin/40324 by Guy Yur
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/usr.sbin/user/user.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/user/user.c
diff -u src/usr.sbin/user/user.c:1.131 src/usr.sbin/user/user.c:1.132
--- src/usr.sbin/user/user.c:1.131 Wed Nov 28 11:31:27 2012
+++ src/usr.sbin/user/user.c Sun Jun 10 07:52:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: user.c,v 1.131 2012/11/28 11:31:27 blymn Exp $ */
+/* $NetBSD: user.c,v 1.132 2018/06/10 07:52:05 zafer Exp $ */
/*
* Copyright (c) 1999 Alistair G. Crooks. All rights reserved.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1999\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: user.c,v 1.131 2012/11/28 11:31:27 blymn Exp $");
+__RCSID("$NetBSD: user.c,v 1.132 2018/06/10 07:52:05 zafer Exp $");
#endif
#include
@@ -819,6 +819,7 @@ read_defaults(def_t *dp)
NEWARRAY(range_t, up->u_rv, up->u_rsize, exit(1));
up->u_inactive = DEF_INACTIVE;
up->u_expire = DEF_EXPIRE;
+ up->u_homeperm = DEF_HOMEPERM;
gp->g_rsize = 16;
gp->g_defrc = 0;
NEWARRAY(range_t, gp->g_rv, gp->g_rsize, exit(1));
@@ -903,7 +904,6 @@ read_defaults(def_t *dp)
up->u_rc += 1;
}
up->u_defrc = up->u_rc;
- up->u_homeperm = DEF_HOMEPERM;
}
/* return the next valid unused uid */
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: zafer
Date: Sat Jun 9 18:48:31 UTC 2018
Modified Files:
src/sys/ufs/lfs: lfs_bio.c lfs_segment.c
Log Message:
Add missing b_cflags and b_oflags.
Ok dholland@
Addresses PR kern/42342 by Yoshihiro Nakajima
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/ufs/lfs/lfs_bio.c
cvs rdiff -u -r1.276 -r1.277 src/sys/ufs/lfs/lfs_segment.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/lfs_bio.c
diff -u src/sys/ufs/lfs/lfs_bio.c:1.141 src/sys/ufs/lfs/lfs_bio.c:1.142
--- src/sys/ufs/lfs/lfs_bio.c:1.141 Sat Jun 10 05:29:36 2017
+++ src/sys/ufs/lfs/lfs_bio.c Sat Jun 9 18:48:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_bio.c,v 1.141 2017/06/10 05:29:36 maya Exp $ */
+/* $NetBSD: lfs_bio.c,v 1.142 2018/06/09 18:48:31 zafer Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.141 2017/06/10 05:29:36 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.142 2018/06/09 18:48:31 zafer Exp $");
#include
#include
@@ -420,8 +420,7 @@ lfs_bwrite_ext(struct buf *bp, int flags
ASSERT_MAYBE_SEGLOCK(fs);
KASSERT(bp->b_cflags & BC_BUSY);
KASSERT(flags & BW_CLEAN || !LFS_IS_MALLOC_BUF(bp));
- KASSERT(((bp->b_oflags | bp->b_flags) & (BO_DELWRI|B_LOCKED))
- != BO_DELWRI);
+ KASSERT((bp->b_flags & B_LOCKED) || !(bp->b_oflags & BO_DELWRI));
/*
* Don't write *any* blocks if we're mounted read-only, or
Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.276 src/sys/ufs/lfs/lfs_segment.c:1.277
--- src/sys/ufs/lfs/lfs_segment.c:1.276 Wed Jun 6 01:49:09 2018
+++ src/sys/ufs/lfs/lfs_segment.c Sat Jun 9 18:48:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.276 2018/06/06 01:49:09 maya Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.277 2018/06/09 18:48:31 zafer Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.276 2018/06/06 01:49:09 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.277 2018/06/09 18:48:31 zafer Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -1408,13 +1408,13 @@ loop:
continue;
}
#ifdef DIAGNOSTIC
-# ifdef LFS_USE_B_INVAL
- if ((bp->b_flags & BC_INVAL) != 0 && bp->b_iodone == NULL) {
+# ifdef LFS_USE_BC_INVAL
+ if ((bp->b_cflags & BC_INVAL) != 0 && bp->b_iodone == NULL) {
DLOG((DLOG_SEG, "lfs_gather: lbn %" PRId64
" is BC_INVAL\n", bp->b_lblkno));
VOP_PRINT(bp->b_vp);
}
-# endif /* LFS_USE_B_INVAL */
+# endif /* LFS_USE_BC_INVAL */
if (!(bp->b_oflags & BO_DELWRI))
panic("lfs_gather: bp not BO_DELWRI");
if (!(bp->b_flags & B_LOCKED)) {
@@ -2106,7 +2106,7 @@ lfs_writeseg(struct lfs *fs, struct segm
LFS_WRITESEGENTRY(sup, fs, sp->seg_number, bp); /* Ifile */
/*
- * Mark blocks B_BUSY, to prevent then from being changed between
+ * Mark blocks BC_BUSY, to prevent then from being changed between
* the checksum computation and the actual write.
*
* If we are cleaning, check indirect blocks for UNWRITTEN, and if
@@ -2217,7 +2217,7 @@ lfs_writeseg(struct lfs *fs, struct segm
/* Loop through gop_write cluster blocks */
for (byteoffset = 0; byteoffset < (*bpp)->b_bcount;
byteoffset += lfs_sb_getbsize(fs)) {
-#ifdef LFS_USE_B_INVAL
+#ifdef LFS_USE_BC_INVAL
if (((*bpp)->b_cflags & BC_INVAL) != 0 &&
(*bpp)->b_iodone != NULL) {
if (copyin((void *)(*bpp)->b_saveaddr +
@@ -2228,7 +2228,7 @@ lfs_writeseg(struct lfs *fs, struct segm
(*bpp)->b_lblkno);
}
} else
-#endif /* LFS_USE_B_INVAL */
+#endif /* LFS_USE_BC_INVAL */
{
sum = lfs_cksum_part((char *)
(*bpp)->b_data + byteoffset, el_size, sum);
@@ -2320,9 +2320,9 @@ lfs_writeseg(struct lfs *fs, struct segm
bp->b_bcount, bp->b_blkno,
sp->seg_number);
-#ifdef LFS_USE_B_INVAL
+#ifdef LFS_USE_BC_INVAL
/*
- * Fake buffers from the cleaner are marked as B_INVAL.
+ * Fake buffers from the cleaner are marked as BC_INVAL.
* We need to copy the data from user space rather than
* from the buffer indicated.
* XXX == what do I do on an error?
@@ -2333,7 +2333,7 @@ lfs_writeseg(struct lfs *fs, struct segm
panic("lfs_writeseg: "
"copyin failed [2]");
} else
-#endif /* LFS_USE_B_INVAL */
+#endif /* LFS_USE_BC_INVAL */
if (cl->flags & LFS_CL_MALLOC) {
/* copy data into our cluster. */
memcpy(p, bp->b_data, bp->b_bcount);
@@ -2590,8 +2590,7 @@ lfs_cluster_aiodone(struct buf *bp)
tbp->b_flags |= B_ASYNC; /* for biodone */
}
- if (((tbp->b_flags | tbp->b_oflags) &
- (B_LOCKED | BO_DELWRI)) == B_LOCKED)
+ if ((tbp->b_flags & B_LOCKED) && !(tbp->b_oflags & BO_DELWRI))
LFS_UNLOCK_BUF(tbp);
if
CVS commit: src/share/wscons/keymaps
Module Name:src Committed By: zafer Date: Tue May 29 19:45:31 UTC 2018 Modified Files: src/share/wscons/keymaps: pckbd.br.abnt2 Log Message: Add AltGr modifier for brazilian abnt2 keymap. Fixes PR misc/50147 by Vicente Chaves. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/wscons/keymaps/pckbd.br.abnt2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/wscons/keymaps/pckbd.br.abnt2 diff -u src/share/wscons/keymaps/pckbd.br.abnt2:1.1 src/share/wscons/keymaps/pckbd.br.abnt2:1.2 --- src/share/wscons/keymaps/pckbd.br.abnt2:1.1 Fri Mar 18 17:40:02 2005 +++ src/share/wscons/keymaps/pckbd.br.abnt2 Tue May 29 19:45:31 2018 @@ -1,15 +1,17 @@ -# $NetBSD: pckbd.br.abnt2,v 1.1 2005/03/18 17:40:02 drochner Exp $ +# $NetBSD: pckbd.br.abnt2,v 1.2 2018/05/29 19:45:31 zafer Exp $ # # Brazilian keymap for abnt2 by Felipe Bichued -keycode 1 = Escape keycode 2 = 1 exclam onesuperior keycode 3 = 2 at twosuperior keycode 4 = 3 numbersign threesuperior -keycode 5 = 4 dollar sterling sterling -keycode 6 = 5 percent cent cent -keycode 7 = 6 dead_diaeresis +keycode 5 = 4 dollar sterling +keycode 6 = 5 percent cent +keycode 7 = 6 dead_diaeresis notsign keycode 13 = equal plus section +keycode 16 = q Q slash +keycode 17 = w W question +keycode 18 = e E degree keycode 26 = dead_acute dead_grave keycode 27 = bracketleft braceleft ordfeminine keycode 39 = ccedilla Ccedilla @@ -17,9 +19,8 @@ keycode 40 = dead_tilde dead_circumflex keycode 41 = apostrophe quotedbl keycode 43 = bracketright braceright masculine keycode 53 = semicolon colon -keycode 73 = KP_Prior KP_9 -keycode 81 = KP_Next KP_3 +keycode 83 = KP_Delete KP_Separator keycode 86 = backslash bar keycode 115 = slash question degree -keycode 201 = Prior -keycode 209 = Next +keycode 126 = KP_Decimal +keycode 184 = Mode_switch Multi_key
CVS commit: src/sys/kern
Module Name:src
Committed By: zafer
Date: Mon Feb 13 16:53:41 UTC 2017
Modified Files:
src/sys/kern: subr_blist.c
Log Message:
fix number of arguments of kmem_alloc and kmem_zalloc macro. ok skrll.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/kern/subr_blist.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_blist.c
diff -u src/sys/kern/subr_blist.c:1.12 src/sys/kern/subr_blist.c:1.13
--- src/sys/kern/subr_blist.c:1.12 Mon Dec 9 09:35:17 2013
+++ src/sys/kern/subr_blist.c Mon Feb 13 16:53:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_blist.c,v 1.12 2013/12/09 09:35:17 wiz Exp $ */
+/* $NetBSD: subr_blist.c,v 1.13 2017/02/13 16:53:41 zafer Exp $ */
/*-
* Copyright (c) 1998 Matthew Dillon. All Rights Reserved.
@@ -86,7 +86,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_blist.c,v 1.12 2013/12/09 09:35:17 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_blist.c,v 1.13 2017/02/13 16:53:41 zafer Exp $");
#if 0
__FBSDID("$FreeBSD: src/sys/kern/subr_blist.c,v 1.17 2004/06/04 04:03:25 alc Exp $");
#endif
@@ -112,8 +112,8 @@ __FBSDID("$FreeBSD: src/sys/kern/subr_bl
#include
#define KM_SLEEP 1
-#define kmem_zalloc(a,b,c) calloc(1, (a))
-#define kmem_alloc(a,b,c) malloc(a)
+#define kmem_zalloc(a,b) calloc(1, (a))
+#define kmem_alloc(a,b) malloc(a)
#define kmem_free(a,b) free(a)
#include "../sys/blist.h"
CVS commit: src/sbin/chown
Module Name:src Committed By: zafer Date: Tue Jul 12 09:59:42 UTC 2016 Modified Files: src/sbin/chown: chown.8 Log Message: improve description regarding symbolic links. ok @wiz. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sbin/chown/chown.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/chown/chown.8 diff -u src/sbin/chown/chown.8:1.7 src/sbin/chown/chown.8:1.8 --- src/sbin/chown/chown.8:1.7 Tue Dec 17 09:54:08 2013 +++ src/sbin/chown/chown.8 Tue Jul 12 09:59:42 2016 @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)chown.8 8.3 (Berkeley) 3/31/94 -.\" $NetBSD: chown.8,v 1.7 2013/12/17 09:54:08 apb Exp $ +.\" $NetBSD: chown.8,v 1.8 2016/07/12 09:59:42 zafer Exp $ .\" .Dd October 22, 2012 .Dt CHOWN 8 @@ -62,6 +62,9 @@ .Sh DESCRIPTION .Nm sets the user ID and/or the group ID of the specified files. +Symbolic links named by arguments are silently left unchanged unless +.Fl h +is used. .Pp The options are as follows: .Bl -tag -width Ds
CVS commit: src/sbin/iscsid
Module Name:src Committed By: zafer Date: Sun Jul 6 14:41:24 UTC 2014 Modified Files: src/sbin/iscsid: iscsid.8 Log Message: mention requirements for custom kernels. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sbin/iscsid/iscsid.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/iscsid/iscsid.8 diff -u src/sbin/iscsid/iscsid.8:1.10 src/sbin/iscsid/iscsid.8:1.11 --- src/sbin/iscsid/iscsid.8:1.10 Tue Mar 18 18:20:38 2014 +++ src/sbin/iscsid/iscsid.8 Sun Jul 6 14:41:24 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: iscsid.8,v 1.10 2014/03/18 18:20:38 riastradh Exp $ +.\ $NetBSD: iscsid.8,v 1.11 2014/07/06 14:41:24 zafer Exp $ .\ .\ Copyright (c) 2011 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -23,7 +23,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 27, 2012 +.Dd July 6, 2014 .Dt ISCSID 8 .Os .Sh NAME @@ -77,6 +77,13 @@ utility, rather than directly over its c An example of setting up the in-kernel iSCSI initiator is shown in .Xr iscsictl 8 . +.Pp +.Nm +requires +.Xr scsibus 4 +and +.Xr sd 4 +compiled in the kernel to load the iscsi kernel module. .Sh SEE ALSO .Xr daemon 3 , .Xr isns 3 ,
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: zafer Date: Wed May 21 23:59:03 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: MARVELL_NAS Log Message: fix typo. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/MARVELL_NAS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/MARVELL_NAS diff -u src/sys/arch/evbarm/conf/MARVELL_NAS:1.18 src/sys/arch/evbarm/conf/MARVELL_NAS:1.19 --- src/sys/arch/evbarm/conf/MARVELL_NAS:1.18 Sat Oct 5 03:59:49 2013 +++ src/sys/arch/evbarm/conf/MARVELL_NAS Wed May 21 23:59:03 2014 @@ -1,4 +1,4 @@ -# $NetBSD: MARVELL_NAS,v 1.18 2013/10/05 03:59:49 kiyohara Exp $ +# $NetBSD: MARVELL_NAS,v 1.19 2014/05/21 23:59:03 zafer Exp $ # # This configuration supports for generically Marvell NAS. @@ -142,7 +142,7 @@ mainbus0 at root # The boot cpu cpu0 at mainbus? -# Mervell MV88Fxx81 Orion System-on-Chip +# Marvell MV88Fxx81 Orion System-on-Chip mvsoc0 at mainbus? # On-chip PCI Express Interface
CVS commit: src/sys/dev/usb
Module Name:src Committed By: zafer Date: Tue May 20 09:55:06 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add version 1 of SMC 2862WG adapter which is USB 1.0 To generate a diff of this commit: cvs rdiff -u -r1.668 -r1.669 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.668 src/sys/dev/usb/usbdevs:1.669 --- src/sys/dev/usb/usbdevs:1.668 Tue Apr 29 10:55:02 2014 +++ src/sys/dev/usb/usbdevs Tue May 20 09:55:06 2014 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.668 2014/04/29 10:55:02 nonaka Exp $ +$NetBSD: usbdevs,v 1.669 2014/05/20 09:55:06 zafer Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2954,7 +2954,8 @@ product SMC 2202USB 0x0200 10/100 ether product SMC 2206USB 0x0201 EZ Connect USB Ethernet Adapter product SMC3 2662WV1 0xa001 EZ Connect 11Mbps product SMC3 2662WV2 0xa002 EZ Connect 11Mbps v2 -product SMC 2862WG 0xee13 EZ Connect 54Mbps +product SMC 2862WG 0xee13 EZ Connect 54Mbps v2 USB 2.0 +product SMC 2862WG_V1 0xee06 EZ Connect 54Mbps v1 USB 1.0 /* SMK products */ product SMK MCE_IR 0x031d eHome Infrared Transceiver
CVS commit: src/sys/dev/usb
Module Name:src Committed By: zafer Date: Tue May 20 09:56:27 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.660 -r1.661 src/sys/dev/usb/usbdevs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs.h diff -u src/sys/dev/usb/usbdevs.h:1.660 src/sys/dev/usb/usbdevs.h:1.661 --- src/sys/dev/usb/usbdevs.h:1.660 Tue Apr 29 10:56:38 2014 +++ src/sys/dev/usb/usbdevs.h Tue May 20 09:56:26 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: usbdevs.h,v 1.660 2014/04/29 10:56:38 nonaka Exp $ */ +/* $NetBSD: usbdevs.h,v 1.661 2014/05/20 09:56:26 zafer Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -2961,7 +2961,8 @@ #define USB_PRODUCT_SMC_2206USB 0x0201 /* EZ Connect USB Ethernet Adapter */ #define USB_PRODUCT_SMC3_2662WV1 0xa001 /* EZ Connect 11Mbps */ #define USB_PRODUCT_SMC3_2662WV2 0xa002 /* EZ Connect 11Mbps v2 */ -#define USB_PRODUCT_SMC_2862WG 0xee13 /* EZ Connect 54Mbps */ +#define USB_PRODUCT_SMC_2862WG 0xee13 /* EZ Connect 54Mbps v2 USB 2.0 */ +#define USB_PRODUCT_SMC_2862WG_V1 0xee06 /* EZ Connect 54Mbps v1 USB 1.0 */ /* SMK products */ #define USB_PRODUCT_SMK_MCE_IR 0x031d /* eHome Infrared Transceiver */
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: zafer
Date: Tue May 20 09:56:42 UTC 2014
Modified Files:
src/sys/dev/usb: usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.661 -r1.662 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.661 src/sys/dev/usb/usbdevs_data.h:1.662
--- src/sys/dev/usb/usbdevs_data.h:1.661 Tue Apr 29 10:56:38 2014
+++ src/sys/dev/usb/usbdevs_data.h Tue May 20 09:56:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs_data.h,v 1.661 2014/04/29 10:56:38 nonaka Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.662 2014/05/20 09:56:42 zafer Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -9056,7 +9056,11 @@ const struct usb_product usb_products[]
},
{
USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG,
- EZ Connect 54Mbps,
+ EZ Connect 54Mbps v2 USB 2.0,
+ },
+ {
+ USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG_V1,
+ EZ Connect 54Mbps v1 USB 1.0,
},
{
USB_VENDOR_SMK, USB_PRODUCT_SMK_MCE_IR,
@@ -10131,4 +10135,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1994;
+const int usb_nproducts = 1995;
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: zafer
Date: Tue May 20 10:04:38 UTC 2014
Modified Files:
src/sys/dev/usb: if_upgt.c
Log Message:
Add version 1 device of SMC 2862WG accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/if_upgt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.10 src/sys/dev/usb/if_upgt.c:1.11
--- src/sys/dev/usb/if_upgt.c:1.10 Fri Nov 8 03:12:17 2013
+++ src/sys/dev/usb/if_upgt.c Tue May 20 10:04:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.10 2013/11/08 03:12:17 christos Exp $ */
+/* $NetBSD: if_upgt.c,v 1.11 2014/05/20 10:04:38 zafer Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_upgt.c,v 1.10 2013/11/08 03:12:17 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_upgt.c,v 1.11 2014/05/20 10:04:38 zafer Exp $);
#include sys/param.h
#include sys/callout.h
@@ -149,7 +149,8 @@ CFATTACH_DECL_NEW(upgt, sizeof(struct up
static const struct usb_devno upgt_devs_1[] = {
/* version 1 devices */
- { USB_VENDOR_ALCATELT, USB_PRODUCT_ALCATELT_ST120G }
+ { USB_VENDOR_ALCATELT, USB_PRODUCT_ALCATELT_ST120G },
+ { USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG_V1 }
};
static const struct usb_devno upgt_devs_2[] = {
CVS commit: src/share/misc
Module Name:src Committed By: zafer Date: Tue May 6 14:31:21 UTC 2014 Modified Files: src/share/misc: inter.phone Log Message: Update Turkey. Add cities with a population greater than one million. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/share/misc/inter.phone Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/inter.phone diff -u src/share/misc/inter.phone:1.28 src/share/misc/inter.phone:1.29 --- src/share/misc/inter.phone:1.28 Tue May 6 10:16:52 2014 +++ src/share/misc/inter.phone Tue May 6 14:31:21 2014 @@ -1,5 +1,5 @@ # Country Code : City Code : City : Country -# $NetBSD: inter.phone,v 1.28 2014/05/06 10:16:52 gson Exp $ +# $NetBSD: inter.phone,v 1.29 2014/05/06 14:31:21 zafer Exp $ # @(#)inter.phone 8.1 (Berkeley) 6/9/93 20:2:Cairo:Egypt, Arab Rep. of 20:3:Alexandria:Egypt, Arab Rep. of @@ -303,8 +303,14 @@ 86:20:Ghuangzhou:China, People's Rep. of 86:21:Shanghai:China, People's Rep. of 86:591:Fuzhou:China, People's Rep. of -90:1:Istanbul:Turkey -90:4:Ankara:Turkey +90:212:Istanbul:Turkey +90:312:Ankara:Turkey +90:232:Izmir:Turkey +90:224:Bursa:Turkey +90:322:Adana:Turkey +90:342:Gaziantep:Turkey +90:332:Konya:Turkey +90:242:Antalya:Turkey 91:11:New Delhi:India 91:22:Bombay:India 91:33:Calcutta:India
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: zafer
Date: Sat Mar 29 00:59:05 UTC 2014
Modified Files:
src/sys/dev/usb: if_rum.c
Log Message:
Fix an issue with 11g beacon frames.
From FreeBSD Rev. 226465
Makes 11g wep, wpa2 and hostap work again.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/usb/if_rum.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.47 src/sys/dev/usb/if_rum.c:1.48
--- src/sys/dev/usb/if_rum.c:1.47 Tue Jan 22 12:40:42 2013
+++ src/sys/dev/usb/if_rum.c Sat Mar 29 00:59:05 2014
@@ -1,5 +1,5 @@
/* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */
-/* $NetBSD: if_rum.c,v 1.47 2013/01/22 12:40:42 jmcneill Exp $ */
+/* $NetBSD: if_rum.c,v 1.48 2014/03/29 00:59:05 zafer Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini damien.bergam...@free.fr
@@ -24,7 +24,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_rum.c,v 1.47 2013/01/22 12:40:42 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_rum.c,v 1.48 2014/03/29 00:59:05 zafer Exp $);
#include sys/param.h
#include sys/sockio.h
@@ -1476,17 +1476,22 @@ rum_write_multi(struct rum_softc *sc, ui
{
usb_device_request_t req;
usbd_status error;
+ int offset;
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
req.bRequest = RT2573_WRITE_MULTI_MAC;
USETW(req.wValue, 0);
- USETW(req.wIndex, reg);
- USETW(req.wLength, len);
- error = usbd_do_request(sc-sc_udev, req, buf);
- if (error != 0) {
- printf(%s: could not multi write MAC register: %s\n,
- device_xname(sc-sc_dev), usbd_errstr(error));
+ /* write at most 64 bytes at a time */
+ for (offset = 0; offset len; offset += 64) {
+ USETW(req.wIndex, reg + offset);
+ USETW(req.wLength, MIN(len - offset, 64));
+
+ error = usbd_do_request(sc-sc_udev, req, (char *)buf + offset);
+ if (error != 0) {
+ printf(%s: could not multi write MAC register: %s\n,
+ device_xname(sc-sc_dev), usbd_errstr(error));
+ }
}
}
CVS commit: src/bin/ls
Module Name:src Committed By: zafer Date: Thu May 2 22:43:56 UTC 2013 Modified Files: src/bin/ls: print.c Log Message: remove whitespace from end of file. introduced by erh in 1.49 To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/bin/ls/print.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/ls/print.c diff -u src/bin/ls/print.c:1.51 src/bin/ls/print.c:1.52 --- src/bin/ls/print.c:1.51 Fri Jun 29 12:51:38 2012 +++ src/bin/ls/print.c Thu May 2 22:43:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: print.c,v 1.51 2012/06/29 12:51:38 yamt Exp $ */ +/* $NetBSD: print.c,v 1.52 2013/05/02 22:43:55 zafer Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = @(#)print.c 8.5 (Berkeley) 7/28/94; #else -__RCSID($NetBSD: print.c,v 1.51 2012/06/29 12:51:38 yamt Exp $); +__RCSID($NetBSD: print.c,v 1.52 2013/05/02 22:43:55 zafer Exp $); #endif #endif /* not lint */ @@ -461,4 +461,3 @@ printlink(FTSENT *p) else (void)printf(%s, path); } -
CVS commit: src/usr.sbin/traceroute
Module Name:src
Committed By: zafer
Date: Thu Aug 16 00:40:29 UTC 2012
Modified Files:
src/usr.sbin/traceroute: traceroute.c
Log Message:
Pretty print multipath routes. From FreeBSD.
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/usr.sbin/traceroute/traceroute.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/traceroute/traceroute.c
diff -u src/usr.sbin/traceroute/traceroute.c:1.80 src/usr.sbin/traceroute/traceroute.c:1.81
--- src/usr.sbin/traceroute/traceroute.c:1.80 Wed Jan 4 16:09:44 2012
+++ src/usr.sbin/traceroute/traceroute.c Thu Aug 16 00:40:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: traceroute.c,v 1.80 2012/01/04 16:09:44 drochner Exp $ */
+/* $NetBSD: traceroute.c,v 1.81 2012/08/16 00:40:28 zafer Exp $ */
/*
* Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000
@@ -30,7 +30,7 @@ static const char rcsid[] =
__COPYRIGHT(@(#) Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997,\
1998, 1999, 2000\
The Regents of the University of California. All rights reserved.);
-__RCSID($NetBSD: traceroute.c,v 1.80 2012/01/04 16:09:44 drochner Exp $);
+__RCSID($NetBSD: traceroute.c,v 1.81 2012/08/16 00:40:28 zafer Exp $);
#endif
#endif
@@ -984,6 +984,7 @@ again:
continue;
if (!gotlastaddr ||
from-sin_addr.s_addr != lastaddr) {
+ if (gotlastaddr) printf(\n );
print(packet, cc, from);
lastaddr = from-sin_addr.s_addr;
++gotlastaddr;
CVS commit: src/share/man/man5
Module Name:src Committed By: zafer Date: Sat Oct 3 12:45:16 UTC 2009 Modified Files: src/share/man/man5: passwd.conf.5 Log Message: remove trailing whitespace. (hi wiz!) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man5/passwd.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/passwd.conf.5 diff -u src/share/man/man5/passwd.conf.5:1.8 src/share/man/man5/passwd.conf.5:1.9 --- src/share/man/man5/passwd.conf.5:1.8 Mon Sep 5 03:37:15 2005 +++ src/share/man/man5/passwd.conf.5 Sat Oct 3 12:45:15 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: passwd.conf.5,v 1.8 2005/09/05 03:37:15 hubertf Exp $ +.\ $NetBSD: passwd.conf.5,v 1.9 2009/10/03 12:45:15 zafer Exp $ .\ .\ Copyright 1997 Niels Provos pro...@physnet.uni-hamburg.de .\ All rights reserved. @@ -70,7 +70,7 @@ For .Dq sha1 the value of rounds is a 32-bit integer, 0 means use the default -of 24680. +of 24680. For .Dq blowfish the value can be between 4 and 31.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: zafer Date: Wed Jun 24 22:19:14 UTC 2009 Modified Files: src/lib/libc/sys: _lwp_kill.2 Log Message: fix spelling error. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/sys/_lwp_kill.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/_lwp_kill.2 diff -u src/lib/libc/sys/_lwp_kill.2:1.3 src/lib/libc/sys/_lwp_kill.2:1.4 --- src/lib/libc/sys/_lwp_kill.2:1.3 Wed Apr 30 13:10:51 2008 +++ src/lib/libc/sys/_lwp_kill.2 Wed Jun 24 22:19:14 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: _lwp_kill.2,v 1.3 2008/04/30 13:10:51 martin Exp $ +.\ $NetBSD: _lwp_kill.2,v 1.4 2009/06/24 22:19:14 zafer Exp $ .\ .\ Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -49,7 +49,7 @@ .Fa sig argument is given as 0 (zero), .Nm -will test for the existance of the target LWP, but will take no further +will test for the existence of the target LWP, but will take no further action. .Pp Job control signals and uncatchable signals can not be directed to a specific
CVS commit: src/lib/libutil
Module Name:src Committed By: zafer Date: Wed Jun 24 22:31:58 UTC 2009 Modified Files: src/lib/libutil: getlabelsector.3 Log Message: correct spelling error. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libutil/getlabelsector.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/getlabelsector.3 diff -u src/lib/libutil/getlabelsector.3:1.4 src/lib/libutil/getlabelsector.3:1.5 --- src/lib/libutil/getlabelsector.3:1.4 Wed Apr 16 13:35:14 2003 +++ src/lib/libutil/getlabelsector.3 Wed Jun 24 22:31:58 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: getlabelsector.3,v 1.4 2003/04/16 13:35:14 wiz Exp $ +.\ $NetBSD: getlabelsector.3,v 1.5 2009/06/24 22:31:58 zafer Exp $ .\ .\ .\ Copyright 2002 Wasabi Systems, Inc. @@ -57,7 +57,7 @@ functions return values which describe the exact on-disk location of the .Xr disklabel 5 on the current system, or \-1 on error. -These functions supercede the hardcoded +These functions supersede the hardcoded .Dv LABELSECTOR and .Dv LABELOFFSET
CVS commit: src/share/man/man9
Module Name:src Committed By: zafer Date: Wed Jun 24 22:39:41 UTC 2009 Modified Files: src/share/man/man9: fstrans.9 Log Message: fix common spelling error. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man9/fstrans.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/fstrans.9 diff -u src/share/man/man9/fstrans.9:1.13 src/share/man/man9/fstrans.9:1.14 --- src/share/man/man9/fstrans.9:1.13 Sun Apr 12 19:00:56 2009 +++ src/share/man/man9/fstrans.9 Wed Jun 24 22:39:40 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: fstrans.9,v 1.13 2009/04/12 19:00:56 joerg Exp $ +.\ $NetBSD: fstrans.9,v 1.14 2009/06/24 22:39:40 zafer Exp $ .\ .\ Copyright (c) 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -126,8 +126,8 @@ .Fa mp . .It Fn fstrans_start_nowait mp lock_type will not wait for a state change of the file system when attempting to -aquire the lock. -The thread may still sleep while attempting to aquire the lock. +acquire the lock. +The thread may still sleep while attempting to acquire the lock. .It Fn fstrans_done mp releases a lock on the file system .Fa mp .
CVS commit: src/share/man/man4
Module Name:src Committed By: zafer Date: Wed Jun 24 23:10:02 UTC 2009 Modified Files: src/share/man/man4: options.4 Log Message: catch spelling error. To generate a diff of this commit: cvs rdiff -u -r1.379 -r1.380 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.379 src/share/man/man4/options.4:1.380 --- src/share/man/man4/options.4:1.379 Mon May 4 20:09:10 2009 +++ src/share/man/man4/options.4 Wed Jun 24 23:10:02 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.379 2009/05/04 20:09:10 wiz Exp $ +.\ $NetBSD: options.4,v 1.380 2009/06/24 23:10:02 zafer Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -1504,7 +1504,7 @@ It can also lock up the entire i2c bus and even prevent a machine from completing the boot process. Don't use this option unless you know what you're doing and can -accept all sorts of unforseen consequences. +accept all sorts of unforeseen consequences. .El .Ss Networking Options .Bl -ohang
