CVS commit: src/sys/net
Module Name:src
Committed By: roy
Date: Tue Feb 24 20:06:09 UTC 2015
Modified Files:
src/sys/net: route.h
Log Message:
Clean comments and style.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/net/route.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/net/route.h
diff -u src/sys/net/route.h:1.84 src/sys/net/route.h:1.85
--- src/sys/net/route.h:1.84 Fri Jun 6 01:02:47 2014
+++ src/sys/net/route.h Tue Feb 24 20:06:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: route.h,v 1.84 2014/06/06 01:02:47 rmind Exp $ */
+/* $NetBSD: route.h,v 1.85 2015/02/24 20:06:09 roy Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -147,15 +147,14 @@ struct ortentry {
#define RTF_MASK 0x80 /* subnet mask present */
#define RTF_CLONING 0x100 /* generate new routes on use */
#define RTF_XRESOLVE 0x200 /* external daemon resolves name */
-#define RTF_LLINFO 0x400 /* generated by ARP */
+#define RTF_LLINFO 0x400 /* generated by ARP or NDP */
#define RTF_STATIC 0x800 /* manually added */
#define RTF_BLACKHOLE 0x1000 /* just discard pkts (during updates) */
-#define RTF_CLONED 0x2000 /* this is a cloned route */
+#define RTF_CLONED 0x2000 /* this is a cloned route */
#define RTF_PROTO2 0x4000 /* protocol specific routing flag */
#define RTF_PROTO1 0x8000 /* protocol specific routing flag */
#define RTF_SRC 0x1 /* route has fixed source address */
-#define RTF_ANNOUNCE 0x2 /* announce new arp or ndp entry */
-
+#define RTF_ANNOUNCE 0x2 /* announce new ARP or NDP entry */
/*
* Routing statistics.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Tue Feb 24 10:53:54 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #545 and #547 To generate a diff of this commit: cvs rdiff -u -r1.1.2.210 -r1.1.2.211 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.210 src/doc/CHANGES-7.0:1.1.2.211 --- src/doc/CHANGES-7.0:1.1.2.210 Mon Feb 23 05:49:09 2015 +++ src/doc/CHANGES-7.0 Tue Feb 24 10:53:54 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.210 2015/02/23 05:49:09 msaitoh Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.211 2015/02/24 10:53:54 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -16072,3 +16072,22 @@ external/bsd/bind/dist/version 1.12 Update bind to 9.10.1-P2. It includes fix of CVE-2015-1349. [spz, ticket #544] + +sys/dev/pci/ixgbe/ixgbe.c 1.16-1.19 +sys/dev/pci/ixgbe/ixgbe.h 1.2 +sys/dev/pci/ixgbe/ixgbe_netbsd.c 1.2-1.3 + + Fix mutex(9) related problem reported by Uwe Toenjes in PR#49328. + [msaitoh, ticket #545] + +include/unistd.h1.144 +sys/kern/init_sysent.c(regen) +sys/kern/syscalls.c(regen) +sys/kern/syscalls.master 1.272 +sys/rump/include/rump/rump_syscalls.h (regen) +sys/sys/syscall.h(regen) +sys/sys/syscallargs.h(regen) + + Fix return type of the readlinkat(2) syscall. + [khorben, ticket #547] +
CVS commit: [netbsd-7] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Tue Feb 24 10:41:09 UTC 2015
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-7]: ixgbe.c ixgbe.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #545):
sys/dev/pci/ixgbe/ixgbe.h: revision 1.2
sys/dev/pci/ixgbe/ixgbe_netbsd.c: revision 1.3
sys/dev/pci/ixgbe/ixgbe.c: revision 1.16
sys/dev/pci/ixgbe/ixgbe.c: revision 1.17
sys/dev/pci/ixgbe/ixgbe.c: revision 1.18
sys/dev/pci/ixgbe/ixgbe.c: revision 1.19
Add missing IXGBE_RX_LOCK_DESTROY() for the detach path.
Remove extra IXGBE_TX_LOCK()/IXGBE_TX_UNLOCK() from
ixgbe_free_transmit_structures(). This function is called in the end of
the detach function. if_stop was called and almost all resources were
freed, so it's not required to block the TX stuff.
Fix mutex related problem reported by Uwe Toenjes in PR#49328:
- Revert ixgbe_netbsd.c rev. 1.2
- make CORE_LOCK adaptive
- Release spin lock while reinitializing the jumb buffer structure.
disable preemption while scheduling the softint to configure the link.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.1 -r1.1.28.1 src/sys/dev/pci/ixgbe/ixgbe.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/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.14.2.1 src/sys/dev/pci/ixgbe/ixgbe.c:1.14.2.2
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.14.2.1 Tue Feb 17 14:54:37 2015
+++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Feb 24 10:41:09 2015
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.51 2011/04/25 23:34:21 jfv Exp $*/
-/*$NetBSD: ixgbe.c,v 1.14.2.1 2015/02/17 14:54:37 martin Exp $*/
+/*$NetBSD: ixgbe.c,v 1.14.2.2 2015/02/24 10:41:09 martin Exp $*/
#include opt_inet.h
@@ -2710,13 +2710,19 @@ ixgbe_config_link(struct adapter *adapte
sfp = ixgbe_is_sfp(hw);
if (sfp) {
+ void *ip;
+
if (hw-phy.multispeed_fiber) {
hw-mac.ops.setup_sfp(hw);
ixgbe_enable_tx_laser(hw);
- softint_schedule(adapter-msf_si);
+ ip = adapter-msf_si;
} else {
- softint_schedule(adapter-mod_si);
+ ip = adapter-mod_si;
}
+
+ kpreempt_disable();
+ softint_schedule(ip);
+ kpreempt_enable();
} else {
if (hw-mac.ops.check_link)
err = ixgbe_check_link(hw, autoneg,
@@ -3180,10 +3186,8 @@ ixgbe_free_transmit_structures(struct ad
struct tx_ring *txr = adapter-tx_rings;
for (int i = 0; i adapter-num_queues; i++, txr++) {
- IXGBE_TX_LOCK(txr);
ixgbe_free_transmit_buffers(txr);
ixgbe_dma_free(adapter, txr-txdma);
- IXGBE_TX_UNLOCK(txr);
IXGBE_TX_LOCK_DESTROY(txr);
}
free(adapter-tx_rings, M_DEVBUF);
@@ -3935,12 +3939,16 @@ ixgbe_setup_receive_ring(struct rx_ring
/* Free current RX buffer structs and their mbufs */
ixgbe_free_receive_ring(rxr);
+ IXGBE_RX_UNLOCK(rxr);
+
/* Now reinitialize our supply of jumbo mbufs. The number
* or size of jumbo mbufs may have changed.
*/
ixgbe_jcl_reinit(adapter-jcl_head, rxr-ptag-dt_dmat,
2 * adapter-num_rx_desc, adapter-rx_mbuf_sz);
+ IXGBE_RX_LOCK(rxr);
+
/* Configure header split? */
if (ixgbe_header_split)
rxr-hdr_split = TRUE;
@@ -4226,6 +4234,7 @@ ixgbe_free_receive_structures(struct ada
#endif /* LRO */
/* Free the ring memory as well */
ixgbe_dma_free(adapter, rxr-rxdma);
+ IXGBE_RX_LOCK_DESTROY(rxr);
}
free(adapter-rx_rings, M_DEVBUF);
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.1 src/sys/dev/pci/ixgbe/ixgbe.h:1.1.28.1
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.1 Fri Aug 12 21:55:29 2011
+++ src/sys/dev/pci/ixgbe/ixgbe.h Tue Feb 24 10:41:09 2015
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe.h,v 1.24 2011/04/28 23:21:40 jfv Exp $*/
-/*$NetBSD: ixgbe.h,v 1.1 2011/08/12 21:55:29 dyoung Exp $*/
+/*$NetBSD: ixgbe.h,v 1.1.28.1 2015/02/24 10:41:09 martin Exp $*/
#ifndef _IXGBE_H_
@@ -476,7 +476,7 @@ struct adapter {
#define IXGBE_CORE_LOCK_INIT(_sc, _name) \
-mutex_init((_sc)-core_mtx, MUTEX_DEFAULT, IPL_NET)
+mutex_init((_sc)-core_mtx, MUTEX_DEFAULT, IPL_SOFTNET)
#define IXGBE_CORE_LOCK_DESTROY(_sc) mutex_destroy((_sc)-core_mtx)
#define IXGBE_TX_LOCK_DESTROY(_sc)mutex_destroy((_sc)-tx_mtx)
#define IXGBE_RX_LOCK_DESTROY(_sc)mutex_destroy((_sc)-rx_mtx)
CVS commit: [netbsd-7] src/sys
Module Name:src Committed By: martin Date: Tue Feb 24 10:52:43 UTC 2015 Modified Files: src/sys/kern [netbsd-7]: init_sysent.c syscalls.c src/sys/rump/include/rump [netbsd-7]: rump_syscalls.h src/sys/rump/librump/rumpkern [netbsd-7]: rump_syscalls.c src/sys/sys [netbsd-7]: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.287 -r1.287.2.1 src/sys/kern/init_sysent.c cvs rdiff -u -r1.278 -r1.278.2.1 src/sys/kern/syscalls.c cvs rdiff -u -r1.79 -r1.79.2.1 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.104 -r1.104.2.1 \ src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.274 -r1.274.2.1 src/sys/sys/syscall.h cvs rdiff -u -r1.257 -r1.257.2.1 src/sys/sys/syscallargs.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/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.287 src/sys/kern/init_sysent.c:1.287.2.1 --- src/sys/kern/init_sysent.c:1.287 Fri Jul 25 08:27:35 2014 +++ src/sys/kern/init_sysent.c Tue Feb 24 10:52:43 2015 @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.287 2014/07/25 08:27:35 dholland Exp $ */ +/* $NetBSD: init_sysent.c,v 1.287.2.1 2015/02/24 10:52:43 martin Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.270 2014/07/25 08:25:47 dholland Exp + * created from NetBSD: syscalls.master,v 1.270.2.1 2015/02/24 10:47:17 martin Exp */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.287 2014/07/25 08:27:35 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.287.2.1 2015/02/24 10:52:43 martin Exp $); #include opt_modular.h #include opt_ntp.h Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.278 src/sys/kern/syscalls.c:1.278.2.1 --- src/sys/kern/syscalls.c:1.278 Fri Jul 25 08:27:35 2014 +++ src/sys/kern/syscalls.c Tue Feb 24 10:52:43 2015 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.278 2014/07/25 08:27:35 dholland Exp $ */ +/* $NetBSD: syscalls.c,v 1.278.2.1 2015/02/24 10:52:43 martin Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.270 2014/07/25 08:25:47 dholland Exp + * created from NetBSD: syscalls.master,v 1.270.2.1 2015/02/24 10:47:17 martin Exp */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.278 2014/07/25 08:27:35 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.278.2.1 2015/02/24 10:52:43 martin Exp $); #if defined(_KERNEL_OPT) #include opt_modular.h Index: src/sys/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.79 src/sys/rump/include/rump/rump_syscalls.h:1.79.2.1 --- src/sys/rump/include/rump/rump_syscalls.h:1.79 Fri Jul 25 08:27:36 2014 +++ src/sys/rump/include/rump/rump_syscalls.h Tue Feb 24 10:52:43 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.79 2014/07/25 08:27:36 dholland Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.79.2.1 2015/02/24 10:52:43 martin Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.270 2014/07/25 08:25:47 dholland Exp + * created from NetBSD: syscalls.master,v 1.270.2.1 2015/02/24 10:47:17 martin Exp */ #ifndef _RUMP_RUMP_SYSCALLS_H_ @@ -1028,7 +1028,7 @@ int rump_sys_fchownat(int, const char *, int rump_sys_fstatat(int, const char *, struct stat *, int) __RENAME(RUMP_SYS_RENAME_FSTATAT); int rump_sys_utimensat(int, const char *, const struct timespec *, int) __RENAME(RUMP_SYS_RENAME_UTIMENSAT); int rump_sys_openat(int, const char *, int, ...) __RENAME(RUMP_SYS_RENAME_OPENAT); -int rump_sys_readlinkat(int, const char *, char *, size_t) __RENAME(RUMP_SYS_RENAME_READLINKAT); +ssize_t rump_sys_readlinkat(int, const char *, char *, size_t) __RENAME(RUMP_SYS_RENAME_READLINKAT); int rump_sys_symlinkat(const char *, int, const char *) __RENAME(RUMP_SYS_RENAME_SYMLINKAT); int rump_sys_unlinkat(int, const char *, int) __RENAME(RUMP_SYS_RENAME_UNLINKAT); int rump_sys_futimens(int, const struct timespec *) __RENAME(RUMP_SYS_RENAME_FUTIMENS); Index: src/sys/rump/librump/rumpkern/rump_syscalls.c diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.104 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.104.2.1 --- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.104 Fri Jul 25 08:27:36 2014 +++ src/sys/rump/librump/rumpkern/rump_syscalls.c Tue Feb 24 10:52:43 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.c,v 1.104 2014/07/25 08:27:36 dholland Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.104.2.1 2015/02/24 10:52:43 martin Exp $ */ /* * System call vector and marshalling for rump. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.270 2014/07/25 08:25:47
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Tue Feb 24 12:57:58 UTC 2015
Modified Files:
src/sys/dev/pci: if_iwm.c
Log Message:
Work around Coverity CIDs 127102{0,1}: Confused by the comparison
nrates __arraycount(lq-rs_table), coverity erroneously binds nrates
to the range [0..16), whereas it is really bound to [0..15) by
ni-ni_rates.rs_nrates (IEEE80211_RATE_MAXSIZE). We add an explicit comparison
to unconfuse it that will always succeed.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/if_iwm.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/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.13 src/sys/dev/pci/if_iwm.c:1.14
--- src/sys/dev/pci/if_iwm.c:1.13 Mon Feb 23 21:26:15 2015
+++ src/sys/dev/pci/if_iwm.c Tue Feb 24 07:57:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.13 2015/02/24 02:26:15 nonaka Exp $ */
+/* $NetBSD: if_iwm.c,v 1.14 2015/02/24 12:57:58 christos Exp $ */
/* OpenBSD: if_iwm.c,v 1.18 2015/02/11 01:12:42 brad Exp */
/*
@@ -105,7 +105,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.13 2015/02/24 02:26:15 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.14 2015/02/24 12:57:58 christos Exp $);
#include sys/param.h
#include sys/conf.h
@@ -5329,7 +5329,8 @@ iwm_setrates(struct iwm_node *in)
int i, ridx, tab = 0;
int txant = 0;
- if (nrates __arraycount(lq-rs_table)) {
+ if (nrates __arraycount(lq-rs_table) ||
+ nrates IEEE80211_RATE_MAXSIZE) {
DPRINTF((%s: node supports %d rates, driver handles only
%zu\n, DEVNAME(sc), nrates, __arraycount(lq-rs_table)));
return;
CVS commit: [netbsd-7] src
Module Name:src
Committed By: martin
Date: Tue Feb 24 10:47:17 UTC 2015
Modified Files:
src/include [netbsd-7]: unistd.h
src/sys/kern [netbsd-7]: syscalls.master
Log Message:
Pull up following revision(s) (requested by khorben in ticket #547):
include/unistd.h: revision 1.144
sys/kern/syscalls.master: revision 1.272
PR/49684: Pierre Pronchery: readlinkat(2) return type is wrong.
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.142.2.1 src/include/unistd.h
cvs rdiff -u -r1.270 -r1.270.2.1 src/sys/kern/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/unistd.h
diff -u src/include/unistd.h:1.142 src/include/unistd.h:1.142.2.1
--- src/include/unistd.h:1.142 Fri Jul 25 08:30:47 2014
+++ src/include/unistd.h Tue Feb 24 10:47:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.142 2014/07/25 08:30:47 dholland Exp $ */
+/* $NetBSD: unistd.h,v 1.142.2.1 2015/02/24 10:47:17 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -308,7 +308,7 @@ int linkat(int, const char *, int, const
int renameat(int, const char *, int, const char *);
int faccessat(int, const char *, int, int);
int fchownat(int, const char *, uid_t, gid_t, int);
-int readlinkat(int, const char *, char *, size_t);
+ssize_t readlinkat(int, const char *, char *, size_t);
int symlinkat(const char *, int, const char *);
int unlinkat(int, const char *, int);
#endif
Index: src/sys/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.270 src/sys/kern/syscalls.master:1.270.2.1
--- src/sys/kern/syscalls.master:1.270 Fri Jul 25 08:25:47 2014
+++ src/sys/kern/syscalls.master Tue Feb 24 10:47:17 2015
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.270 2014/07/25 08:25:47 dholland Exp $
+ $NetBSD: syscalls.master,v 1.270.2.1 2015/02/24 10:47:17 martin Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -919,7 +919,7 @@
const struct timespec *tptr, int flag); }
468 STD RUMP { int|sys||openat(int fd, const char *path, \
int oflags, ... mode_t mode); }
-469 STD RUMP { int|sys||readlinkat(int fd, const char *path, \
+469 STD RUMP { ssize_t|sys||readlinkat(int fd, const char *path, \
char *buf, size_t bufsize); }
470 STD RUMP { int|sys||symlinkat(const char *path1, int fd, \
const char *path2); }
CVS commit: src/sys/sys
Module Name:src Committed By: joerg Date: Tue Feb 24 13:17:27 UTC 2015 Modified Files: src/sys/sys: ctype_inline.h Log Message: Fix spelling of feature test macro. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/sys/ctype_inline.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/sys/ctype_inline.h diff -u src/sys/sys/ctype_inline.h:1.3 src/sys/sys/ctype_inline.h:1.4 --- src/sys/sys/ctype_inline.h:1.3 Sat Apr 13 10:21:21 2013 +++ src/sys/sys/ctype_inline.h Tue Feb 24 13:17:27 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ctype_inline.h,v 1.3 2013/04/13 10:21:21 joerg Exp $ */ +/* $NetBSD: ctype_inline.h,v 1.4 2015/02/24 13:17:27 joerg Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -66,7 +66,7 @@ #define _toupper(c) ((c) - 'a' + 'A') #endif -#if defined(_ISO_C99_SOURCE) || (_POSIX_C_SOURCE - 0) 200112L || \ +#if defined(_ISOC99_SOURCE) || (_POSIX_C_SOURCE - 0) 200112L || \ (_XOPEN_SOURCE - 0) 600 || defined(_NETBSD_SOURCE) #define isblank(c) ((int)((_ctype_tab_ + 1)[(c)] _CTYPE_BL)) #endif
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Tue Feb 24 13:59:58 UTC 2015 Modified Files: src/sys/dev/pci/ixgbe: ixgbe_type.h Log Message: Modify comments to make difference among *BSDs small. No binary change. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/ixgbe/ixgbe_type.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/pci/ixgbe/ixgbe_type.h diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.3 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.4 --- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.3 Tue Feb 24 13:38:53 2015 +++ src/sys/dev/pci/ixgbe/ixgbe_type.h Tue Feb 24 13:59:58 2015 @@ -31,7 +31,7 @@ **/ /*$FreeBSD: src/sys/dev/ixgbe/ixgbe_type.h,v 1.12 2011/01/19 19:36:27 jfv Exp $*/ -/*$NetBSD: ixgbe_type.h,v 1.3 2015/02/24 13:38:53 msaitoh Exp $*/ +/*$NetBSD: ixgbe_type.h,v 1.4 2015/02/24 13:59:58 msaitoh Exp $*/ #ifndef _IXGBE_TYPE_H_ #define _IXGBE_TYPE_H_ @@ -293,7 +293,7 @@ #define IXGBE_FDIRCMD 0x0EE2C /* Transmit DMA registers */ -#define IXGBE_TDBAL(_i) (0x06000 + ((_i) * 0x40)) /* 32 of these (0-31)*/ +#define IXGBE_TDBAL(_i) (0x06000 + ((_i) * 0x40)) /* 32 of them (0-31)*/ #define IXGBE_TDBAH(_i) (0x06004 + ((_i) * 0x40)) #define IXGBE_TDLEN(_i) (0x06008 + ((_i) * 0x40)) #define IXGBE_TDH(_i) (0x06010 + ((_i) * 0x40)) @@ -405,7 +405,6 @@ #define IXGBE_WUS_FLX5 IXGBE_WUFC_FLX5 #define IXGBE_WUS_FLX_FILTERS IXGBE_WUFC_FLX_FILTERS -/* Wake Up Packet Length */ #define IXGBE_WUPL_LENGTH_MASK 0x /* DCB registers */ @@ -688,7 +687,7 @@ #define IXGBE_QPRDC(_i) (0x01430 + ((_i) * 0x40)) /* 16 of these */ #define IXGBE_QBTC_L(_i) (0x08700 + ((_i) * 0x8)) /* 16 of these */ #define IXGBE_QBTC_H(_i) (0x08704 + ((_i) * 0x8)) /* 16 of these */ -#define IXGBE_FCCRC 0x05118 /* Count of Good Eth CRC w/ Bad FC CRC */ +#define IXGBE_FCCRC 0x05118 /* Num of Good Eth CRC w/ Bad FC CRC */ #define IXGBE_FCOERPDC 0x0241C /* FCoE Rx Packets Dropped Count */ #define IXGBE_FCLAST 0x02424 /* FCoE Last Error Count */ #define IXGBE_FCOEPRC 0x02428 /* Number of FCoE Packets Received */ @@ -924,15 +923,15 @@ #define IXGBE_RSCDBU_RSCACKDIS 0x0080 /* RDRXCTL Bit Masks */ -#define IXGBE_RDRXCTL_RDMTS_1_2 0x /* Rx Desc Min Threshold Size */ +#define IXGBE_RDRXCTL_RDMTS_1_2 0x /* Rx Desc Min THLD Size */ #define IXGBE_RDRXCTL_CRCSTRIP 0x0002 /* CRC Strip */ #define IXGBE_RDRXCTL_MVMEN 0x0020 #define IXGBE_RDRXCTL_DMAIDONE 0x0008 /* DMA init cycle done */ #define IXGBE_RDRXCTL_AGGDIS 0x0001 /* Aggregation disable */ #define IXGBE_RDRXCTL_RSCFRSTSIZE 0x003E /* RSC First packet size */ #define IXGBE_RDRXCTL_RSCLLIDIS 0x0080 /* Disable RSC compl on LLI*/ -#define IXGBE_RDRXCTL_RSCACKC 0x0200 /* must set 1 when RSC enabled */ -#define IXGBE_RDRXCTL_FCOE_WRFIX 0x0400 /* must set 1 when RSC enabled */ +#define IXGBE_RDRXCTL_RSCACKC 0x0200 /* must set 1 when RSC ena */ +#define IXGBE_RDRXCTL_FCOE_WRFIX 0x0400 /* must set 1 when RSC ena */ /* RQTC Bit Masks and Shifts */ #define IXGBE_RQTC_SHIFT_TC(_i) ((_i) * 4) @@ -977,12 +976,12 @@ #define IXGBE_DCA_RXCTRL_CPUID_MASK 0x001F /* Rx CPUID Mask */ #define IXGBE_DCA_RXCTRL_CPUID_MASK_82599 0xFF00 /* Rx CPUID Mask */ #define IXGBE_DCA_RXCTRL_CPUID_SHIFT_82599 24 /* Rx CPUID Shift */ -#define IXGBE_DCA_RXCTRL_DESC_DCA_EN (1 5) /* DCA Rx Desc enable */ -#define IXGBE_DCA_RXCTRL_HEAD_DCA_EN (1 6) /* DCA Rx Desc header enable */ -#define IXGBE_DCA_RXCTRL_DATA_DCA_EN (1 7) /* DCA Rx Desc payload enable */ -#define IXGBE_DCA_RXCTRL_DESC_RRO_EN (1 9) /* DCA Rx rd Desc Relax Order */ -#define IXGBE_DCA_RXCTRL_DESC_WRO_EN (1 13) /* DCA Rx wr Desc Relax Order */ -#define IXGBE_DCA_RXCTRL_DESC_HSRO_EN (1 15) /* DCA Rx Split Header RO */ +#define IXGBE_DCA_RXCTRL_DESC_DCA_EN (1 5) /* Rx Desc enable */ +#define IXGBE_DCA_RXCTRL_HEAD_DCA_EN (1 6) /* Rx Desc header ena */ +#define IXGBE_DCA_RXCTRL_DATA_DCA_EN (1 7) /* Rx Desc payload ena */ +#define IXGBE_DCA_RXCTRL_DESC_RRO_EN (1 9) /* Rx rd Desc Relax Order */ +#define IXGBE_DCA_RXCTRL_DESC_WRO_EN (1 13) /* Rx wr Desc Relax Order */ +#define IXGBE_DCA_RXCTRL_DESC_HSRO_EN (1 15) /* Rx Split Header RO */ #define IXGBE_DCA_TXCTRL_CPUID_MASK 0x001F /* Tx CPUID Mask */ #define IXGBE_DCA_TXCTRL_CPUID_MASK_82599 0xFF00 /* Tx CPUID Mask */ @@ -992,24 +991,24 @@ #define IXGBE_DCA_MAX_QUEUES_82598 16 /* DCA regs only on 16 queues */ /* MSCA Bit Masks */ -#define IXGBE_MSCA_NP_ADDR_MASK 0x /* MDI Address (new protocol) */ +#define IXGBE_MSCA_NP_ADDR_MASK 0x /* MDI Addr (new prot) */ #define IXGBE_MSCA_NP_ADDR_SHIFT 0 -#define IXGBE_MSCA_DEV_TYPE_MASK 0x001F /* Device Type (new protocol) */ -#define IXGBE_MSCA_DEV_TYPE_SHIFT 16 /* Register Address (old protocol */ +#define
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Tue Feb 24 14:14:50 UTC 2015
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe_82599.c ixgbe_api.c ixgbe_type.h
Log Message:
Change macro name IXGBE_DEV_ID_82599_SFP_DELL to IXGBE_DEV_ID_82599_SFP_SF2.
Same as OpenBSD and Linux. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/ixgbe/ixgbe_82599.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/ixgbe/ixgbe_api.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/ixgbe/ixgbe_type.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/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.19 src/sys/dev/pci/ixgbe/ixgbe.c:1.20
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.19 Sat Feb 7 00:02:09 2015
+++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Feb 24 14:14:50 2015
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.51 2011/04/25 23:34:21 jfv Exp $*/
-/*$NetBSD: ixgbe.c,v 1.19 2015/02/07 00:02:09 christos Exp $*/
+/*$NetBSD: ixgbe.c,v 1.20 2015/02/24 14:14:50 msaitoh Exp $*/
#include opt_inet.h
@@ -107,7 +107,7 @@ static ixgbe_vendor_info_t ixgbe_vendor_
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_COMBO_BACKPLANE, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_BACKPLANE_FCOE, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_FCOE, 0, 0, 0},
- {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_DELL, 0, 0, 0},
+ {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_SF2, 0, 0, 0},
/* required last entry */
{0, 0, 0, 0, 0}
};
Index: src/sys/dev/pci/ixgbe/ixgbe_82599.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.3 src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.4
--- src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.3 Thu Apr 17 15:34:05 2014
+++ src/sys/dev/pci/ixgbe/ixgbe_82599.c Tue Feb 24 14:14:50 2015
@@ -31,7 +31,7 @@
**/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe_82599.c,v 1.6 2011/01/19 19:36:27 jfv Exp $*/
-/*$NetBSD: ixgbe_82599.c,v 1.3 2014/04/17 15:34:05 christos Exp $*/
+/*$NetBSD: ixgbe_82599.c,v 1.4 2015/02/24 14:14:50 msaitoh Exp $*/
#include ixgbe_type.h
#include ixgbe_api.h
@@ -434,7 +434,7 @@ enum ixgbe_media_type ixgbe_get_media_ty
break;
case IXGBE_DEV_ID_82599_SFP:
case IXGBE_DEV_ID_82599_SFP_FCOE:
- case IXGBE_DEV_ID_82599_SFP_DELL:
+ case IXGBE_DEV_ID_82599_SFP_SF2:
media_type = ixgbe_media_type_fiber;
break;
case IXGBE_DEV_ID_82599_CX4:
Index: src/sys/dev/pci/ixgbe/ixgbe_api.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_api.c:1.2 src/sys/dev/pci/ixgbe/ixgbe_api.c:1.3
--- src/sys/dev/pci/ixgbe/ixgbe_api.c:1.2 Tue Apr 8 19:39:06 2014
+++ src/sys/dev/pci/ixgbe/ixgbe_api.c Tue Feb 24 14:14:50 2015
@@ -31,7 +31,7 @@
**/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe_api.c,v 1.11 2010/11/26 22:46:32 jfv Exp $*/
-/*$NetBSD: ixgbe_api.c,v 1.2 2014/04/08 19:39:06 christos Exp $*/
+/*$NetBSD: ixgbe_api.c,v 1.3 2015/02/24 14:14:50 msaitoh Exp $*/
#include ixgbe_api.h
#include ixgbe_common.h
@@ -119,7 +119,7 @@ s32 ixgbe_set_mac_type(struct ixgbe_hw *
case IXGBE_DEV_ID_82599_SFP_FCOE:
case IXGBE_DEV_ID_82599_CX4:
case IXGBE_DEV_ID_82599_T3_LOM:
- case IXGBE_DEV_ID_82599_SFP_DELL:
+ case IXGBE_DEV_ID_82599_SFP_SF2:
hw-mac.type = ixgbe_mac_82599EB;
break;
case IXGBE_DEV_ID_82599_VF:
Index: src/sys/dev/pci/ixgbe/ixgbe_type.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.5 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.6
--- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.5 Tue Feb 24 14:08:07 2015
+++ src/sys/dev/pci/ixgbe/ixgbe_type.h Tue Feb 24 14:14:50 2015
@@ -31,7 +31,7 @@
**/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe_type.h,v 1.12 2011/01/19 19:36:27 jfv Exp $*/
-/*$NetBSD: ixgbe_type.h,v 1.5 2015/02/24 14:08:07 msaitoh Exp $*/
+/*$NetBSD: ixgbe_type.h,v 1.6 2015/02/24 14:14:50 msaitoh Exp $*/
#ifndef _IXGBE_TYPE_H_
#define _IXGBE_TYPE_H_
@@ -71,9 +71,9 @@
#define IXGBE_DEV_ID_82599_BACKPLANE_FCOE 0x152A
#define IXGBE_DEV_ID_82599_SFP_FCOE 0x1529
#define IXGBE_DEV_ID_82599_XAUI_LOM PCI_PRODUCT_INTEL_82599_XAUI_LOM
+#define IXGBE_DEV_ID_82599_SFP_SF2 0x154D
#define IXGBE_DEV_ID_82599_T3_LOM 0x151C
#define IXGBE_DEV_ID_82599_VF 0x10ED
-#define IXGBE_DEV_ID_82599_SFP_DELL 0x154d
/* General Registers */
#define IXGBE_CTRL 0x0
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Tue Feb 24 14:08:07 UTC 2015 Modified Files: src/sys/dev/pci/ixgbe: ixgbe_type.h Log Message: Enclose macro argument correctly. Same as *BSDs. No binary change. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/ixgbe/ixgbe_type.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/pci/ixgbe/ixgbe_type.h diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.4 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.5 --- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.4 Tue Feb 24 13:59:58 2015 +++ src/sys/dev/pci/ixgbe/ixgbe_type.h Tue Feb 24 14:08:07 2015 @@ -31,7 +31,7 @@ **/ /*$FreeBSD: src/sys/dev/ixgbe/ixgbe_type.h,v 1.12 2011/01/19 19:36:27 jfv Exp $*/ -/*$NetBSD: ixgbe_type.h,v 1.4 2015/02/24 13:59:58 msaitoh Exp $*/ +/*$NetBSD: ixgbe_type.h,v 1.5 2015/02/24 14:08:07 msaitoh Exp $*/ #ifndef _IXGBE_TYPE_H_ #define _IXGBE_TYPE_H_ @@ -164,19 +164,19 @@ /* Receive DMA Registers */ #define IXGBE_RDBAL(_i) (((_i) 64) ? (0x01000 + ((_i) * 0x40)) : \ - (0x0D000 + ((_i - 64) * 0x40))) + (0x0D000 + (((_i) - 64) * 0x40))) #define IXGBE_RDBAH(_i) (((_i) 64) ? (0x01004 + ((_i) * 0x40)) : \ - (0x0D004 + ((_i - 64) * 0x40))) + (0x0D004 + (((_i) - 64) * 0x40))) #define IXGBE_RDLEN(_i) (((_i) 64) ? (0x01008 + ((_i) * 0x40)) : \ - (0x0D008 + ((_i - 64) * 0x40))) + (0x0D008 + (((_i) - 64) * 0x40))) #define IXGBE_RDH(_i) (((_i) 64) ? (0x01010 + ((_i) * 0x40)) : \ - (0x0D010 + ((_i - 64) * 0x40))) + (0x0D010 + (((_i) - 64) * 0x40))) #define IXGBE_RDT(_i) (((_i) 64) ? (0x01018 + ((_i) * 0x40)) : \ - (0x0D018 + ((_i - 64) * 0x40))) + (0x0D018 + (((_i) - 64) * 0x40))) #define IXGBE_RXDCTL(_i) (((_i) 64) ? (0x01028 + ((_i) * 0x40)) : \ - (0x0D028 + ((_i - 64) * 0x40))) + (0x0D028 + (((_i) - 64) * 0x40))) #define IXGBE_RSCCTL(_i) (((_i) 64) ? (0x0102C + ((_i) * 0x40)) : \ - (0x0D02C + ((_i - 64) * 0x40))) + (0x0D02C + (((_i) - 64) * 0x40))) #define IXGBE_RSCDBU 0x03028 #define IXGBE_RDDCC 0x02F20 #define IXGBE_RXMEMWRAP 0x03190 @@ -189,7 +189,7 @@ */ #define IXGBE_SRRCTL(_i) (((_i) = 15) ? (0x02100 + ((_i) * 4)) : \ (((_i) 64) ? (0x01014 + ((_i) * 0x40)) : \ - (0x0D014 + ((_i - 64) * 0x40 + (0x0D014 + (((_i) - 64) * 0x40 /* * Rx DCA Control Register: * 00-15 : 0x02200 + n*4 @@ -198,7 +198,7 @@ */ #define IXGBE_DCA_RXCTRL(_i) (((_i) = 15) ? (0x02200 + ((_i) * 4)) : \ (((_i) 64) ? (0x0100C + ((_i) * 0x40)) : \ - (0x0D00C + ((_i - 64) * 0x40 + (0x0D00C + (((_i) - 64) * 0x40 #define IXGBE_RDRXCTL 0x02F00 #define IXGBE_RDRXCTL_RSC_PUSH 0x80 /* 8 of these 0x03C00 - 0x03C1C */ @@ -2022,9 +2022,9 @@ /* SR-IOV specific macros */ #define IXGBE_MBVFICR_INDEX(vf_number) (vf_number 4) -#define IXGBE_MBVFICR(_i) (0x00710 + (_i * 4)) +#define IXGBE_MBVFICR(_i) (0x00710 + ((_i) * 4)) #define IXGBE_VFLRE(_i) (((_i 1) ? 0x001C0 : 0x00600)) -#define IXGBE_VFLREC(_i) (0x00700 + (_i * 4)) +#define IXGBE_VFLREC(_i) (0x00700 + ((_i) * 4)) /* Little Endian defines */ #ifndef __le16
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Tue Feb 24 14:49:29 UTC 2015
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe_82599.c ixgbe_api.c ixgbe_type.h
Log Message:
Add 82599EN_SFP and 82599_SFP_SF_QP. Not tested.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/ixgbe/ixgbe_82599.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/ixgbe/ixgbe_api.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/ixgbe/ixgbe_type.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/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.20 src/sys/dev/pci/ixgbe/ixgbe.c:1.21
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.20 Tue Feb 24 14:14:50 2015
+++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Feb 24 14:49:28 2015
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.51 2011/04/25 23:34:21 jfv Exp $*/
-/*$NetBSD: ixgbe.c,v 1.20 2015/02/24 14:14:50 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.21 2015/02/24 14:49:28 msaitoh Exp $*/
#include opt_inet.h
@@ -106,8 +106,10 @@ static ixgbe_vendor_info_t ixgbe_vendor_
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_T3_LOM, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_COMBO_BACKPLANE, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_BACKPLANE_FCOE, 0, 0, 0},
- {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_FCOE, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_SF2, 0, 0, 0},
+ {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_FCOE, 0, 0, 0},
+ {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599EN_SFP, 0, 0, 0},
+ {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_SF_QP, 0, 0, 0},
/* required last entry */
{0, 0, 0, 0, 0}
};
Index: src/sys/dev/pci/ixgbe/ixgbe_82599.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.4 src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.5
--- src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.4 Tue Feb 24 14:14:50 2015
+++ src/sys/dev/pci/ixgbe/ixgbe_82599.c Tue Feb 24 14:49:28 2015
@@ -31,7 +31,7 @@
**/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe_82599.c,v 1.6 2011/01/19 19:36:27 jfv Exp $*/
-/*$NetBSD: ixgbe_82599.c,v 1.4 2015/02/24 14:14:50 msaitoh Exp $*/
+/*$NetBSD: ixgbe_82599.c,v 1.5 2015/02/24 14:49:28 msaitoh Exp $*/
#include ixgbe_type.h
#include ixgbe_api.h
@@ -435,6 +435,8 @@ enum ixgbe_media_type ixgbe_get_media_ty
case IXGBE_DEV_ID_82599_SFP:
case IXGBE_DEV_ID_82599_SFP_FCOE:
case IXGBE_DEV_ID_82599_SFP_SF2:
+ case IXGBE_DEV_ID_82599_SFP_SF_QP:
+ case IXGBE_DEV_ID_82599EN_SFP:
media_type = ixgbe_media_type_fiber;
break;
case IXGBE_DEV_ID_82599_CX4:
Index: src/sys/dev/pci/ixgbe/ixgbe_api.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_api.c:1.3 src/sys/dev/pci/ixgbe/ixgbe_api.c:1.4
--- src/sys/dev/pci/ixgbe/ixgbe_api.c:1.3 Tue Feb 24 14:14:50 2015
+++ src/sys/dev/pci/ixgbe/ixgbe_api.c Tue Feb 24 14:49:28 2015
@@ -31,7 +31,7 @@
**/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe_api.c,v 1.11 2010/11/26 22:46:32 jfv Exp $*/
-/*$NetBSD: ixgbe_api.c,v 1.3 2015/02/24 14:14:50 msaitoh Exp $*/
+/*$NetBSD: ixgbe_api.c,v 1.4 2015/02/24 14:49:28 msaitoh Exp $*/
#include ixgbe_api.h
#include ixgbe_common.h
@@ -117,9 +117,11 @@ s32 ixgbe_set_mac_type(struct ixgbe_hw *
case IXGBE_DEV_ID_82599_SFP:
case IXGBE_DEV_ID_82599_BACKPLANE_FCOE:
case IXGBE_DEV_ID_82599_SFP_FCOE:
+ case IXGBE_DEV_ID_82599_SFP_SF2:
+ case IXGBE_DEV_ID_82599_SFP_SF_QP:
+ case IXGBE_DEV_ID_82599EN_SFP:
case IXGBE_DEV_ID_82599_CX4:
case IXGBE_DEV_ID_82599_T3_LOM:
- case IXGBE_DEV_ID_82599_SFP_SF2:
hw-mac.type = ixgbe_mac_82599EB;
break;
case IXGBE_DEV_ID_82599_VF:
Index: src/sys/dev/pci/ixgbe/ixgbe_type.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.6 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.7
--- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.6 Tue Feb 24 14:14:50 2015
+++ src/sys/dev/pci/ixgbe/ixgbe_type.h Tue Feb 24 14:49:28 2015
@@ -31,7 +31,7 @@
**/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe_type.h,v 1.12 2011/01/19 19:36:27 jfv Exp $*/
-/*$NetBSD: ixgbe_type.h,v 1.6 2015/02/24 14:14:50 msaitoh Exp $*/
+/*$NetBSD: ixgbe_type.h,v 1.7 2015/02/24 14:49:28 msaitoh Exp $*/
#ifndef _IXGBE_TYPE_H_
#define _IXGBE_TYPE_H_
@@ -70,8 +70,10 @@
#define IXGBE_SUBDEV_ID_82599_SFP 0x11A9
#define IXGBE_DEV_ID_82599_BACKPLANE_FCOE 0x152A
#define IXGBE_DEV_ID_82599_SFP_FCOE 0x1529
-#define IXGBE_DEV_ID_82599_XAUI_LOM PCI_PRODUCT_INTEL_82599_XAUI_LOM
#define IXGBE_DEV_ID_82599_SFP_SF2 0x154D
+#define IXGBE_DEV_ID_82599_SFP_SF_QP 0x154A
+#define IXGBE_DEV_ID_82599EN_SFP 0x1557
+#define IXGBE_DEV_ID_82599_XAUI_LOM PCI_PRODUCT_INTEL_82599_XAUI_LOM
#define IXGBE_DEV_ID_82599_T3_LOM 0x151C
#define IXGBE_DEV_ID_82599_VF 0x10ED
CVS commit: src/sys/fs/union
Module Name:src
Committed By: hannken
Date: Tue Feb 24 16:08:01 UTC 2015
Modified Files:
src/sys/fs/union: union_subr.c
Log Message:
A union node may be reactivated while it is being reclaimed so
change union_freevp() to detach the vnode from the union node
by clearing the vnode backpointer and the lower node sizes.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/fs/union/union_subr.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/fs/union/union_subr.c
diff -u src/sys/fs/union/union_subr.c:1.70 src/sys/fs/union/union_subr.c:1.71
--- src/sys/fs/union/union_subr.c:1.70 Mon Feb 16 10:22:00 2015
+++ src/sys/fs/union/union_subr.c Tue Feb 24 16:08:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: union_subr.c,v 1.70 2015/02/16 10:22:00 hannken Exp $ */
+/* $NetBSD: union_subr.c,v 1.71 2015/02/24 16:08:01 hannken Exp $ */
/*
* Copyright (c) 1994
@@ -72,7 +72,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: union_subr.c,v 1.70 2015/02/16 10:22:00 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: union_subr.c,v 1.71 2015/02/24 16:08:01 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -534,8 +534,14 @@ union_freevp(struct vnode *vp)
{
struct union_node *un = VTOUNION(vp);
+ /* Detach vnode from union node. */
+ un-un_vnode = NULL;
+ un-un_uppersz = VNOVAL;
+ un-un_lowersz = VNOVAL;
+
vcache_remove(vp-v_mount, un, sizeof(un));
+ /* Detach union node from vnode. */
mutex_enter(vp-v_interlock);
vp-v_data = NULL;
mutex_exit(vp-v_interlock);
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Tue Feb 24 16:57:02 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: ohci.c
Log Message:
Convert to USBHIST
To generate a diff of this commit:
cvs rdiff -u -r1.254.2.17 -r1.254.2.18 src/sys/dev/usb/ohci.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/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.254.2.17 src/sys/dev/usb/ohci.c:1.254.2.18
--- src/sys/dev/usb/ohci.c:1.254.2.17 Sun Feb 22 08:25:02 2015
+++ src/sys/dev/usb/ohci.c Tue Feb 24 16:57:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.254.2.17 2015/02/22 08:25:02 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.254.2.18 2015/02/24 16:57:02 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,9 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.254.2.17 2015/02/22 08:25:02 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.254.2.18 2015/02/24 16:57:02 skrll Exp $);
+
+#include opt_usb.h
#include sys/param.h
@@ -52,6 +54,7 @@ __KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.2
#include sys/proc.h
#include sys/queue.h
#include sys/select.h
+#include sys/sysctl.h
#include sys/systm.h
#include machine/endian.h
@@ -65,17 +68,48 @@ __KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.2
#include dev/usb/ohcireg.h
#include dev/usb/ohcivar.h
#include dev/usb/usbroothub.h
+#include dev/usb/usbhist.h
+#ifdef USB_DEBUG
+#ifndef OHCI_DEBUG
+#define ohcidebug 0
+#else
+static int ohcidebug = 0;
+SYSCTL_SETUP(sysctl_hw_ohci_setup, sysctl hw.ohci setup)
+{
+ int err;
+ const struct sysctlnode *rnode;
+ const struct sysctlnode *cnode;
+
+ err = sysctl_createv(clog, 0, NULL, rnode,
+ CTLFLAG_PERMANENT, CTLTYPE_NODE, ohci,
+ SYSCTL_DESCR(ohci global controls),
+ NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL);
-#ifdef OHCI_DEBUG
-#define DPRINTF(x) if (ohcidebug) printf x
-#define DPRINTFN(n,x) if (ohcidebug(n)) printf x
-int ohcidebug = 0;
-#else
-#define DPRINTF(x)
-#define DPRINTFN(n,x)
-#endif
+ if (err)
+ goto fail;
+
+ /* control debugging printfs */
+ err = sysctl_createv(clog, 0, rnode, cnode,
+ CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
+ debug, SYSCTL_DESCR(Enable debugging output),
+ NULL, 0, ohcidebug, sizeof(ohcidebug), CTL_CREATE, CTL_EOL);
+ if (err)
+ goto fail;
+
+ return;
+fail:
+ aprint_error(%s: sysctl_createv failed (err = %d)\n, __func__, err);
+}
+
+#endif /* OHCI_DEBUG */
+#endif /* USB_DEBUG */
+
+#define DPRINTF(FMT,A,B,C,D) USBHIST_LOG(ohcidebug,FMT,A,B,C,D)
+#define DPRINTFN(N,FMT,A,B,C,D) USBHIST_LOGN(ohcidebug,N,FMT,A,B,C,D)
+#define OHCIHIST_FUNC() USBHIST_FUNC()
+#define OHCIHIST_CALLED(name) USBHIST_CALLED(ohcidebug)
#if BYTE_ORDER == BIG_ENDIAN
#define SWAP_ENDIAN OHCI_LITTLE_ENDIAN
@@ -358,8 +392,10 @@ ohci_alloc_sed(ohci_softc_t *sc)
int i, offs;
usb_dma_t dma;
+ OHCIHIST_FUNC(); OHCIHIST_CALLED();
+
if (sc-sc_freeeds == NULL) {
- DPRINTFN(2, (ohci_alloc_sed: allocating chunk\n));
+ DPRINTFN(2, allocating chunk, 0, 0, 0, 0);
err = usb_allocmem(sc-sc_bus, OHCI_SED_SIZE * OHCI_SED_CHUNK,
OHCI_ED_ALIGN, dma);
if (err)
@@ -396,10 +432,12 @@ ohci_alloc_std(ohci_softc_t *sc)
int i, offs;
usb_dma_t dma;
+ OHCIHIST_FUNC(); OHCIHIST_CALLED();
+
KASSERT(sc-sc_bus.ub_usepolling || mutex_owned(sc-sc_lock));
if (sc-sc_freetds == NULL) {
- DPRINTFN(2, (ohci_alloc_std: allocating chunk\n));
+ DPRINTFN(2, allocating chunk, 0, 0, 0, 0);
err = usb_allocmem(sc-sc_bus, OHCI_STD_SIZE * OHCI_STD_CHUNK,
OHCI_TD_ALIGN, dma);
if (err)
@@ -448,10 +486,16 @@ ohci_alloc_std_chain(struct ohci_pipe *o
usb_dma_t *dma = xfer-ux_dmabuf;
uint16_t flags = xfer-ux_flags;
- DPRINTFN(alen 4096,(ohci_alloc_std_chain: start len=%d\n, alen));
+ OHCIHIST_FUNC(); OHCIHIST_CALLED();
+ DPRINTF(start len=%d, alen, 0, 0, 0);
KASSERT(mutex_owned(sc-sc_lock));
+ DPRINTFN(8, addr=%d endpt=%d len=%d speed=%d,
+ opipe-pipe.up_dev-ud_addr,
+ UE_GET_ADDR(opipe-pipe.up_endpoint-ue_edesc-bEndpointAddress),
+ alen, opipe-pipe.up_dev-ud_speed);
+
len = alen;
cur = sp;
dataphys = DMAADDR(dma, 0);
@@ -484,10 +528,8 @@ ohci_alloc_std_chain(struct ohci_pipe *o
panic(ohci_alloc_std: curlen == 0);
#endif
}
- DPRINTFN(4,(ohci_alloc_std_chain: dataphys=0x%08x
- dataphysend=0x%08x len=%d curlen=%d\n,
- dataphys, dataphysend,
- len, curlen));
+ DPRINTFN(4, dataphys=0x%08x dataphysend=0x%08x
+ len=%d curlen=%d, dataphys, dataphysend, len, curlen);
len -= curlen;
cur-td.td_flags = tdflags;
@@ -500,11 +542,11 @@ ohci_alloc_std_chain(struct ohci_pipe *o
cur-xfer = xfer;
usb_syncmem(cur-dma, cur-offs, sizeof(cur-td),
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
- DPRINTFN(10,(ohci_alloc_std_chain: cbp=0x%08x be=0x%08x\n,
- dataphys, dataphys + curlen - 1));
+ DPRINTFN(10, cbp=0x%08x be=0x%08x,
CVS commit: src/lib/libc/resolv
Module Name:src Committed By: christos Date: Tue Feb 24 17:56:20 UTC 2015 Modified Files: src/lib/libc/resolv: herror.c res_comp.c res_debug.c res_init.c res_mkquery.c res_query.c res_send.c Log Message: belated removal of the advertising clause. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/resolv/herror.c cvs rdiff -u -r1.12 -r1.13 src/lib/libc/resolv/res_comp.c cvs rdiff -u -r1.13 -r1.14 src/lib/libc/resolv/res_debug.c cvs rdiff -u -r1.29 -r1.30 src/lib/libc/resolv/res_init.c \ src/lib/libc/resolv/res_send.c cvs rdiff -u -r1.14 -r1.15 src/lib/libc/resolv/res_mkquery.c cvs rdiff -u -r1.15 -r1.16 src/lib/libc/resolv/res_query.c 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/resolv/herror.c diff -u src/lib/libc/resolv/herror.c:1.9 src/lib/libc/resolv/herror.c:1.10 --- src/lib/libc/resolv/herror.c:1.9 Tue Mar 13 17:13:43 2012 +++ src/lib/libc/resolv/herror.c Tue Feb 24 12:56:20 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: herror.c,v 1.9 2012/03/13 21:13:43 christos Exp $ */ +/* $NetBSD: herror.c,v 1.10 2015/02/24 17:56:20 christos Exp $ */ /* * Copyright (c) 1987, 1993 @@ -12,11 +12,7 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors *may be used to endorse or promote products derived from this software *without specific prior written permission. * @@ -56,7 +52,7 @@ static const char sccsid[] = @(#)herror.c 8.1 (Berkeley) 6/4/93; static const char rcsid[] = Id: herror.c,v 1.4 2005/04/27 04:56:41 sra Exp; #else -__RCSID($NetBSD: herror.c,v 1.9 2012/03/13 21:13:43 christos Exp $); +__RCSID($NetBSD: herror.c,v 1.10 2015/02/24 17:56:20 christos Exp $); #endif #endif /* LIBC_SCCS and not lint */ Index: src/lib/libc/resolv/res_comp.c diff -u src/lib/libc/resolv/res_comp.c:1.12 src/lib/libc/resolv/res_comp.c:1.13 --- src/lib/libc/resolv/res_comp.c:1.12 Tue Mar 13 17:13:43 2012 +++ src/lib/libc/resolv/res_comp.c Tue Feb 24 12:56:20 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: res_comp.c,v 1.12 2012/03/13 21:13:43 christos Exp $ */ +/* $NetBSD: res_comp.c,v 1.13 2015/02/24 17:56:20 christos Exp $ */ /* * Copyright (c) 1985, 1993 @@ -12,11 +12,7 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors *may be used to endorse or promote products derived from this software *without specific prior written permission. * @@ -75,7 +71,7 @@ static const char sccsid[] = @(#)res_comp.c 8.1 (Berkeley) 6/4/93; static const char rcsid[] = Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp; #else -__RCSID($NetBSD: res_comp.c,v 1.12 2012/03/13 21:13:43 christos Exp $); +__RCSID($NetBSD: res_comp.c,v 1.13 2015/02/24 17:56:20 christos Exp $); #endif #endif /* LIBC_SCCS and not lint */ Index: src/lib/libc/resolv/res_debug.c diff -u src/lib/libc/resolv/res_debug.c:1.13 src/lib/libc/resolv/res_debug.c:1.14 --- src/lib/libc/resolv/res_debug.c:1.13 Mon Jun 25 18:32:45 2012 +++ src/lib/libc/resolv/res_debug.c Tue Feb 24 12:56:20 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: res_debug.c,v 1.13 2012/06/25 22:32:45 abs Exp $ */ +/* $NetBSD: res_debug.c,v 1.14 2015/02/24 17:56:20 christos Exp $ */ /* * Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. (ISC) @@ -29,11 +29,7 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its
CVS commit: src/include/arpa
Module Name:src Committed By: christos Date: Tue Feb 24 17:57:08 UTC 2015 Modified Files: src/include/arpa: nameser_compat.h Log Message: belated removal of the advertising clause. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/include/arpa/nameser_compat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/arpa/nameser_compat.h diff -u src/include/arpa/nameser_compat.h:1.5 src/include/arpa/nameser_compat.h:1.6 --- src/include/arpa/nameser_compat.h:1.5 Sun Apr 12 13:07:34 2009 +++ src/include/arpa/nameser_compat.h Tue Feb 24 12:57:08 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: nameser_compat.h,v 1.5 2009/04/12 17:07:34 christos Exp $ */ +/* $NetBSD: nameser_compat.h,v 1.6 2015/02/24 17:57:08 christos Exp $ */ /* Copyright (c) 1983, 1989 *The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors *may be used to endorse or promote products derived from this software *without specific prior written permission. *
CVS commit: src/sbin/drvctl
Module Name:src
Committed By: mlelstv
Date: Tue Feb 24 18:15:29 UTC 2015
Modified Files:
src/sbin/drvctl: drvctl.8 drvctl.c
Log Message:
Let drvctl -p select elements from an array property by numeric index.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sbin/drvctl/drvctl.8
cvs rdiff -u -r1.16 -r1.17 src/sbin/drvctl/drvctl.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/drvctl/drvctl.8
diff -u src/sbin/drvctl/drvctl.8:1.13 src/sbin/drvctl/drvctl.8:1.14
--- src/sbin/drvctl/drvctl.8:1.13 Mon Jan 16 19:43:50 2012
+++ src/sbin/drvctl/drvctl.8 Tue Feb 24 18:15:29 2015
@@ -1,4 +1,4 @@
-.\ $NetBSD: drvctl.8,v 1.13 2012/01/16 19:43:50 pgoyette Exp $
+.\ $NetBSD: drvctl.8,v 1.14 2015/02/24 18:15:29 mlelstv Exp $
.\
.\ Copyright (c) 2004
.\ Matthias Drochner. All rights reserved.
@@ -114,7 +114,9 @@ argument.
If
.Ar property
is specified, the value of that property is printed, otherwise
-the properties are displayed as an XML property list.
+the properties are displayed as an XML property list. The
+property can be given as a path of dictionary keys and numeric
+array indexes separated by slashes.
.It Fl Q
Resume the ancestors of
.Ar device ,
Index: src/sbin/drvctl/drvctl.c
diff -u src/sbin/drvctl/drvctl.c:1.16 src/sbin/drvctl/drvctl.c:1.17
--- src/sbin/drvctl/drvctl.c:1.16 Tue Jan 17 08:22:09 2012
+++ src/sbin/drvctl/drvctl.c Tue Feb 24 18:15:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: drvctl.c,v 1.16 2012/01/17 08:22:09 wiz Exp $ */
+/* $NetBSD: drvctl.c,v 1.17 2015/02/24 18:15:29 mlelstv Exp $ */
/*
* Copyright (c) 2004
@@ -226,21 +226,37 @@ extract_property(prop_dictionary_t dict,
{
char *s, *p, *cur, *ep = NULL;
prop_object_t obj;
+ unsigned long ind;
+ obj = dict;
+ cur = NULL;
s = strdup(prop);
p = strtok_r(s, /, ep);
while (p) {
cur = p;
p = strtok_r(NULL, /, ep);
- if (p) {
- if (prop_dictionary_get_dict(dict, cur, dict) == false)
+
+ switch (prop_object_type(obj)) {
+ case PROP_TYPE_DICTIONARY:
+ obj = prop_dictionary_get(obj, cur);
+ if (obj == NULL)
exit(EXIT_FAILURE);
- } else {
- obj = prop_dictionary_get(dict, cur);
- display_object(obj, nflag);
+ break;
+ case PROP_TYPE_ARRAY:
+ ind = strtoul(cur, NULL, 0);
+ obj = prop_array_get(obj, ind);
+ if (obj == NULL)
+exit(EXIT_FAILURE);
+ break;
+ default:
+ fprintf(stderr, select neither dict nor array with '%s'\n, cur);
+ exit(EXIT_FAILURE);
}
}
+ if (obj != NULL cur != NULL)
+ display_object(obj, nflag);
+
free(s);
}
CVS commit: src/share/man/man4
Module Name:src
Committed By: roy
Date: Tue Feb 24 19:11:13 UTC 2015
Modified Files:
src/share/man/man4: route.4
Log Message:
Sync route flags from net/route.h
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/share/man/man4/route.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/route.4
diff -u src/share/man/man4/route.4:1.22 src/share/man/man4/route.4:1.23
--- src/share/man/man4/route.4:1.22 Fri May 24 14:40:18 2013
+++ src/share/man/man4/route.4 Tue Feb 24 19:11:13 2015
@@ -1,4 +1,4 @@
-.\ $NetBSD: route.4,v 1.22 2013/05/24 14:40:18 njoly Exp $
+.\ $NetBSD: route.4,v 1.23 2015/02/24 19:11:13 roy Exp $
.\
.\ Copyright (c) 1990, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ @(#)route.4 8.6 (Berkeley) 4/19/94
.\
-.Dd May 21, 2013
+.Dd February 24, 2015
.Dt ROUTE 4
.Os
.Sh NAME
@@ -292,22 +292,24 @@ struct rt_metrics {
.Pp
Flags include the values:
.Bd -literal
-#define RTF_UP0x1 /* route usable */
-#define RTF_GATEWAY 0x2 /* destination is a gateway */
-#define RTF_HOST 0x4 /* host entry (net otherwise) */
-#define RTF_REJECT0x8 /* host or net unreachable */
-#define RTF_DYNAMIC 0x10 /* created dynamically (by redirect) */
-#define RTF_MODIFIED 0x20 /* modified dynamically (by redirect) */
-#define RTF_DONE 0x40 /* message confirmed */
-#define RTF_MASK 0x80 /* subnet mask present */
-#define RTF_CLONING 0x100/* generate new routes on use */
-#define RTF_XRESOLVE 0x200/* external daemon resolves name */
-#define RTF_LLINFO0x400/* generated by ARP or ESIS */
-#define RTF_STATIC0x800/* manually added */
-#define RTF_BLACKHOLE 0x1000 /* just discard pkts (during updates) */
-#define RTF_CLONED0x2000 /* this is a cloned route */
-#define RTF_PROTO20x4000 /* protocol specific routing flag */
-#define RTF_PROTO10x8000 /* protocol specific routing flag */
+#define RTF_UP0x1 /* route usable */
+#define RTF_GATEWAY 0x2 /* destination is a gateway */
+#define RTF_HOST 0x4 /* host entry (net otherwise) */
+#define RTF_REJECT0x8 /* host or net unreachable */
+#define RTF_DYNAMIC 0x10 /* created dynamically (by redirect) */
+#define RTF_MODIFIED 0x20 /* modified dynamically (by redirect) */
+#define RTF_DONE 0x40 /* message confirmed */
+#define RTF_MASK 0x80 /* subnet mask present */
+#define RTF_CLONING 0x100 /* generate new routes on use */
+#define RTF_XRESOLVE 0x200 /* external daemon resolves name */
+#define RTF_LLINFO0x400 /* generated by ARP or NDP */
+#define RTF_STATIC0x800 /* manually added */
+#define RTF_BLACKHOLE 0x1000/* just discard pkts (during updates) */
+#define RTF_CLONED0x2000/* this is a cloned route */
+#define RTF_PROTO20x4000/* protocol specific routing flag */
+#define RTF_PROTO10x8000/* protocol specific routing flag */
+#define RTF_SRC 0x1 /* route has fixed source address */
+#define RTF_ANNOUNCE 0x2 /* announce new ARP or NDP entry */
.Ed
.Pp
Specifiers for metric values in rmx_locks and rtm_inits are:
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: joerg Date: Tue Feb 24 22:02:40 UTC 2015 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h Log Message: Restore PAGER_MAP_DEFAULT_SIZE for ARMv4, they typically have only 256MB KVA. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/include/arm32/vmparam.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/arch/arm/include/arm32/vmparam.h diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.35 src/sys/arch/arm/include/arm32/vmparam.h:1.36 --- src/sys/arch/arm/include/arm32/vmparam.h:1.35 Sun Jul 27 21:31:34 2014 +++ src/sys/arch/arm/include/arm32/vmparam.h Tue Feb 24 22:02:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.35 2014/07/27 21:31:34 skrll Exp $ */ +/* $NetBSD: vmparam.h,v 1.36 2015/02/24 22:02:40 joerg Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -50,6 +50,14 @@ #define USRSTACK VM_MAXUSER_ADDRESS /* + * ARMv4 systems are normaly configured for 256MB KVA only, so restrict + * the size of the pager map to 4MB. + */ +#ifndef _ARM_ARCH_5 +#define PAGER_MAP_DEFAULT_SIZE (4 * 1024 * 1024) +#endif + +/* * Note that MAXTSIZ can't be larger than 32M, otherwise the compiler * would have to be changed to not generate bl instructions. */
CVS commit: src/sys/netinet6
Module Name:src
Committed By: roy
Date: Wed Feb 25 00:26:59 UTC 2015
Modified Files:
src/sys/netinet6: in6.c nd6.c nd6.h nd6_nbr.c nd6_rtr.c
Log Message:
Retire nd6_newaddrmsg and use rt_newaddrmsg directly instead so that
we don't spam route changes when the route hasn't changed.
To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/sys/netinet6/in6.c
cvs rdiff -u -r1.158 -r1.159 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.62 -r1.63 src/sys/netinet6/nd6.h
cvs rdiff -u -r1.104 -r1.105 src/sys/netinet6/nd6_nbr.c
cvs rdiff -u -r1.96 -r1.97 src/sys/netinet6/nd6_rtr.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/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.182 src/sys/netinet6/in6.c:1.183
--- src/sys/netinet6/in6.c:1.182 Mon Feb 23 19:15:59 2015
+++ src/sys/netinet6/in6.c Wed Feb 25 00:26:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.182 2015/02/23 19:15:59 martin Exp $ */
+/* $NetBSD: in6.c,v 1.183 2015/02/25 00:26:58 roy Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: in6.c,v 1.182 2015/02/23 19:15:59 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: in6.c,v 1.183 2015/02/25 00:26:58 roy Exp $);
#include opt_inet.h
#include opt_compat_netbsd.h
@@ -194,21 +194,7 @@ in6_ifloop_request(int cmd, struct ifadd
* omit the second report?
*/
if (nrt) {
- if (cmd != RTM_ADD ||
- !(((struct in6_ifaddr *)ifa)-ia6_flags IN6_IFF_TENTATIVE))
- {
-#if 0
- struct in6_ifaddr *ia;
-
- ia = (struct in6_ifaddr *)ifa;
- log(LOG_DEBUG,
- in6_ifloop_request: announced %s (%s %d)\n,
- ip6_sprintf(ia-ia_addr.sin6_addr),
- cmd == RTM_ADD ? RTM_ADD : RTM_DELETE,
- ia-ia6_flags);
-#endif
- rt_newaddrmsg(cmd, ifa, e, nrt);
- }
+ rt_newaddrmsg(cmd, ifa, e, nrt);
if (cmd == RTM_DELETE) {
if (nrt-rt_refcnt = 0) {
/* XXX: we should free the entry ourselves. */
@@ -1799,7 +1785,7 @@ in6_ifinit(struct ifnet *ifp, struct in6
in6_ifaddloop(ia-ia_ifa);
} else {
/* Inform the routing socket of new flags/timings */
- nd6_newaddrmsg(ia-ia_ifa);
+ rt_newaddrmsg(RTM_NEWADDR, ia-ia_ifa, 0, NULL);
}
if (ifp-if_flags IFF_MULTICAST)
@@ -2110,7 +2096,7 @@ in6_if_link_up(struct ifnet *ifp)
%s marked tentative\n,
ip6_sprintf(ia-ia_addr.sin6_addr)));
} else if ((ia-ia6_flags IN6_IFF_TENTATIVE) == 0)
-nd6_newaddrmsg(ifa);
+rt_newaddrmsg(RTM_NEWADDR, ifa, 0, NULL);
}
if (ia-ia6_flags IN6_IFF_TENTATIVE) {
@@ -2184,7 +2170,7 @@ in6_if_link_down(struct ifnet *ifp)
ia-ia6_flags |= IN6_IFF_DETACHED;
ia-ia6_flags =
~(IN6_IFF_TENTATIVE | IN6_IFF_DUPLICATED);
- nd6_newaddrmsg(ifa);
+ rt_newaddrmsg(RTM_NEWADDR, ifa, 0, NULL);
}
}
}
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.158 src/sys/netinet6/nd6.c:1.159
--- src/sys/netinet6/nd6.c:1.158 Mon Feb 23 19:15:59 2015
+++ src/sys/netinet6/nd6.c Wed Feb 25 00:26:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.158 2015/02/23 19:15:59 martin Exp $ */
+/* $NetBSD: nd6.c,v 1.159 2015/02/25 00:26:58 roy Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.158 2015/02/23 19:15:59 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.159 2015/02/25 00:26:58 roy Exp $);
#include bridge.h
#include carp.h
@@ -599,7 +599,8 @@ nd6_timer(void *ignored_arg)
if ((oldflags IN6_IFF_DEPRECATED) == 0) {
ia6-ia6_flags |= IN6_IFF_DEPRECATED;
-nd6_newaddrmsg((struct ifaddr *)ia6);
+rt_newaddrmsg(RTM_NEWADDR,
+(struct ifaddr *)ia6, 0, NULL);
}
/*
@@ -633,7 +634,8 @@ nd6_timer(void *ignored_arg)
*/
if (ia6-ia6_flags IN6_IFF_DEPRECATED) {
ia6-ia6_flags = ~IN6_IFF_DEPRECATED;
-nd6_newaddrmsg((struct ifaddr *)ia6);
+rt_newaddrmsg(RTM_NEWADDR,
+(struct ifaddr *)ia6, 0, NULL);
}
}
}
Index: src/sys/netinet6/nd6.h
diff -u src/sys/netinet6/nd6.h:1.62 src/sys/netinet6/nd6.h:1.63
--- src/sys/netinet6/nd6.h:1.62 Mon Feb 23 19:15:59 2015
+++ src/sys/netinet6/nd6.h Wed Feb 25 00:26:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.h,v 1.62 2015/02/23 19:15:59 martin Exp $ */
+/* $NetBSD: nd6.h,v 1.63 2015/02/25 00:26:58 roy Exp $ */
/* $KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $ */
/*
@@ -442,7 +442,6 @@ void nd6_ns_input(struct mbuf *, int, in
void nd6_ns_output(struct ifnet *, const struct in6_addr *,
const struct in6_addr *, struct llinfo_nd6 *, int);
const void *nd6_ifptomac(const struct ifnet *);
-void nd6_newaddrmsg(struct ifaddr *);
void nd6_dad_start(struct ifaddr *, int);
void nd6_dad_stop(struct ifaddr *);
void nd6_dad_duplicated(struct ifaddr *);
Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.104
