PERFORCE change 126066 for review
Kip Macy
kmacy at FreeBSD.org
Tue Sep 4 12:13:51 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=126066
Change 126066 by kmacy at kmacy_home:ethng on 2007/09/04 19:13:27
IFC #126063
Affected files ...
.. //depot/projects/ethng/src/ObsoleteFiles.inc#3 integrate
.. //depot/projects/ethng/src/contrib/less/main.c#3 integrate
.. //depot/projects/ethng/src/etc/rc.d/lockd#3 integrate
.. //depot/projects/ethng/src/lib/libutil/Makefile#2 integrate
.. //depot/projects/ethng/src/lib/libutil/expand_number.3#1 branch
.. //depot/projects/ethng/src/lib/libutil/expand_number.c#1 branch
.. //depot/projects/ethng/src/lib/libutil/libutil.h#2 integrate
.. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate
.. //depot/projects/ethng/src/release/doc/share/misc/dev.archlist.txt#3 integrate
.. //depot/projects/ethng/src/sbin/geom/class/eli/geli.8#2 integrate
.. //depot/projects/ethng/src/sbin/ipfw/ipfw2.c#2 integrate
.. //depot/projects/ethng/src/share/man/man4/Makefile#3 integrate
.. //depot/projects/ethng/src/share/man/man4/zyd.4#1 branch
.. //depot/projects/ethng/src/share/man/man5/src.conf.5#2 integrate
.. //depot/projects/ethng/src/share/man/man9/suser.9#2 integrate
.. //depot/projects/ethng/src/sys/amd64/linux32/linux32_proto.h#2 integrate
.. //depot/projects/ethng/src/sys/amd64/linux32/linux32_syscall.h#2 integrate
.. //depot/projects/ethng/src/sys/amd64/linux32/linux32_sysent.c#2 integrate
.. //depot/projects/ethng/src/sys/amd64/linux32/syscalls.master#2 integrate
.. //depot/projects/ethng/src/sys/arm/xscale/i80321/i80321.c#2 integrate
.. //depot/projects/ethng/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/ethng/src/sys/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/isp/isp_freebsd.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ixgbe/ixgbe.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ixgbe/ixgbe.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/ixgbe/ixgbe_82598.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ixgbe/ixgbe_api.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ixgbe/ixgbe_api.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/ixgbe/ixgbe_common.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ixgbe/ixgbe_common.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/ixgbe/ixgbe_phy.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ixgbe/ixgbe_phy.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/ixgbe/ixgbe_type.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/mfi/mfi_pci.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/mfi/mfireg.h#3 integrate
.. //depot/projects/ethng/src/sys/dev/mfi/mfivar.h#3 integrate
.. //depot/projects/ethng/src/sys/dev/usb/if_zyd.c#1 branch
.. //depot/projects/ethng/src/sys/dev/usb/if_zydfw.h#1 branch
.. //depot/projects/ethng/src/sys/dev/usb/if_zydreg.h#1 branch
.. //depot/projects/ethng/src/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/ethng/src/sys/fs/msdosfs/direntry.h#2 integrate
.. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_conv.c#3 integrate
.. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate
.. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate
.. //depot/projects/ethng/src/sys/geom/eli/g_eli.h#2 integrate
.. //depot/projects/ethng/src/sys/geom/eli/g_eli_crypto.c#2 integrate
.. //depot/projects/ethng/src/sys/i386/isa/isa.c#2 integrate
.. //depot/projects/ethng/src/sys/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/ethng/src/sys/i386/linux/linux_syscall.h#2 integrate
.. //depot/projects/ethng/src/sys/i386/linux/linux_sysent.c#2 integrate
.. //depot/projects/ethng/src/sys/i386/linux/syscalls.master#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_ktrace.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_sysctl.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_timeout.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/ethng/src/sys/modules/ixgbe/Makefile#1 branch
.. //depot/projects/ethng/src/sys/modules/zyd/Makefile#1 branch
.. //depot/projects/ethng/src/sys/net/if_lagg.c#2 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_freebsd.c#2 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_regdomain.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp.h#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_asconf.c#4 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_asconf.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_auth.c#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_constants.h#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_input.c#4 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_output.c#4 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_output.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_pcb.h#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_peeloff.c#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_structs.h#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_sysctl.h#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_uio.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_usrreq.c#4 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_var.h#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctputil.c#4 integrate
.. //depot/projects/ethng/src/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/ethng/src/sys/sys/mount.h#2 integrate
.. //depot/projects/ethng/src/tools/build/options/WITHOUT_ZONEINFO#1 branch
.. //depot/projects/ethng/src/tools/regression/geom_eli/init-a.t#2 integrate
.. //depot/projects/ethng/src/tools/regression/geom_eli/init.t#2 integrate
.. //depot/projects/ethng/src/tools/regression/geom_eli/integrity-copy.t#2 integrate
.. //depot/projects/ethng/src/tools/regression/geom_eli/integrity-data.t#2 integrate
.. //depot/projects/ethng/src/tools/regression/geom_eli/integrity-hmac.t#2 integrate
.. //depot/projects/ethng/src/tools/regression/geom_eli/onetime-a.t#2 integrate
.. //depot/projects/ethng/src/tools/regression/geom_eli/onetime.t#2 integrate
.. //depot/projects/ethng/src/usr.bin/top/top.local.1#2 integrate
.. //depot/projects/ethng/src/usr.sbin/kbdmap/kbdmap.c#2 integrate
Differences ...
==== //depot/projects/ethng/src/ObsoleteFiles.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.109 2007/08/07 23:48:30 marcel Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.110 2007/08/31 19:41:27 yar Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -797,6 +797,10 @@
OLD_FILES+=usr/share/man/man1/omshell.1.gz
OLD_FILES+=usr/share/man/man5/dhcp-eval.5.gz
# 200504XX: ipf tools moved from /usr to /
+OLD_FILES+=rescue/ipfs
+OLD_FILES+=rescue/ipfstat
+OLD_FILES+=rescue/ipmon
+OLD_FILES+=rescue/ipnat
OLD_FILES+=usr/sbin/ipftest
OLD_FILES+=usr/sbin/ipresend
OLD_FILES+=usr/sbin/ipsend
@@ -828,6 +832,7 @@
OLD_FILES+=usr/libexec/getNAME
# 200411XX: gvinum replaces vinum
OLD_FILES+=bin/vinum
+OLD_FILES+=rescue/vinum
OLD_FILES+=sbin/vinum
OLD_FILES+=usr/share/man/man8/vinum.8.gz
# 200411XX: libxpg4 removal
==== //depot/projects/ethng/src/contrib/less/main.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/less/main.c,v 1.11 2007/08/13 16:15:26 delphij Exp $ */
+/* $FreeBSD: src/contrib/less/main.c,v 1.12 2007/09/04 13:54:09 delphij Exp $ */
/*
* Copyright (C) 1984-2007 Mark Nudelman
*
@@ -244,7 +244,7 @@
quit(QUIT_OK);
}
- if (missing_cap && !know_dumb)
+ if (missing_cap && !know_dumb && !less_is_more)
error("WARNING: terminal is not fully functional", NULL_PARG);
init_mark();
open_getchr();
==== //depot/projects/ethng/src/etc/rc.d/lockd#3 (text+ko) ====
@@ -2,11 +2,11 @@
#
# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
# FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm
-# $FreeBSD: src/etc/rc.d/lockd,v 1.17 2007/08/18 04:08:53 mtm Exp $
+# $FreeBSD: src/etc/rc.d/lockd,v 1.18 2007/09/03 02:02:31 mtm Exp $
#
# PROVIDE: lockd
-# REQUIRE: nfsserver nfsclient nfsd rpcbind
+# REQUIRE: nfsserver nfsclient nfsd rpcbind statd
# BEFORE: DAEMON
# KEYWORD: nojail
==== //depot/projects/ethng/src/lib/libutil/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libutil/Makefile,v 1.65 2007/05/21 02:49:07 deischen Exp $
+# $FreeBSD: src/lib/libutil/Makefile,v 1.66 2007/09/01 06:19:11 pjd Exp $
SHLIBDIR?= /lib
@@ -8,8 +8,8 @@
LIB= util
SHLIB_MAJOR= 7
-SRCS= _secure_path.c auth.c flopen.c fparseln.c humanize_number.c \
- kld.c login.c login_auth.c login_cap.c login_class.c \
+SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c \
+ humanize_number.c kld.c login.c login_auth.c login_cap.c login_class.c \
login_crypt.c login_ok.c login_times.c login_tty.c logout.c \
logwtmp.c pidfile.c property.c pty.c pw_util.c realhostname.c \
stub.c trimdomain.c uucplock.c
@@ -27,7 +27,7 @@
login_cap.3 login_class.3 login_times.3 login_ok.3 \
_secure_path.3 uucplock.3 property.3 auth.3 realhostname.3 \
realhostname_sa.3 trimdomain.3 fparseln.3 humanize_number.3 \
- pidfile.3 flopen.3
+ pidfile.3 flopen.3 expand_number.3
MAN+= login.conf.5 auth.conf.5
MLINKS+= kld.3 kld_isloaded.3 kld.3 kld_load.3
MLINKS+= property.3 properties_read.3 property.3 properties_free.3
==== //depot/projects/ethng/src/lib/libutil/libutil.h#2 (text+ko) ====
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libutil/libutil.h,v 1.44 2007/05/10 15:01:42 des Exp $
+ * $FreeBSD: src/lib/libutil/libutil.h,v 1.45 2007/09/01 06:19:11 pjd Exp $
*/
#ifndef _LIBUTIL_H_
@@ -82,6 +82,7 @@
struct termios *_termp, struct winsize *_winp);
int humanize_number(char *_buf, size_t _len, int64_t _number,
const char *_suffix, int _scale, int _flags);
+int expand_number(char *_buf, int64_t *_num);
const char *uu_lockerr(int _uu_lockresult);
int uu_lock(const char *_ttyname);
int uu_unlock(const char *_ttyname);
==== //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 (text+ko) ====
@@ -18,7 +18,7 @@
<corpauthor>The &os; Documentation Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.318 2007/08/18 16:40:37 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.320 2007/09/02 09:15:08 brueffer Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -742,8 +742,17 @@
<sect2 id="wlan">
<title>Wireless Network Interfaces</title>
- <para>[&arch.i386;] NCR / AT&T / Lucent Technologies WaveLan T1-speed
- ISA/radio LAN cards (&man.wl.4; driver)</para>
+ <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Cisco/Aironet 802.11b wireless adapters (&man.an.4; driver)
+ </para>
+
+ &hwlist.ath;
+
+ &hwlist.awi;
+
+ &hwlist.cnw;
+
+ <para>[&arch.i386;, &arch.pc98;] Raytheon Raylink 2.4GHz wireless adapters (&man.ray.4; driver)
+ </para>
<para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Lucent Technologies WaveLAN/IEEE 802.11b
wireless network
@@ -752,17 +761,11 @@
Spectrum24 chipsets (&man.wi.4; driver)
</para>
- <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Cisco/Aironet 802.11b wireless adapters (&man.an.4; driver)
- </para>
+ <para>[&arch.i386;] NCR / AT&T / Lucent Technologies WaveLan T1-speed
+ ISA/radio LAN cards (&man.wl.4; driver)</para>
- <para>[&arch.i386;, &arch.pc98;] Raytheon Raylink 2.4GHz wireless adapters (&man.ray.4; driver)
- </para>
-
- &hwlist.awi;
+ &hwlist.zyd;
- &hwlist.cnw;
-
- &hwlist.ath;
</sect2>
<sect2 id="misc-network">
==== //depot/projects/ethng/src/release/doc/share/misc/dev.archlist.txt#3 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.96 2007/08/15 04:46:04 bmah Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.97 2007/09/02 09:11:10 brueffer Exp $
#
#
@@ -172,3 +172,4 @@
vx i386,pc98,ia64,amd64
wb i386,pc98,amd64
xe i386,amd64
+zyd i386,amd64
==== //depot/projects/ethng/src/sbin/geom/class/eli/geli.8#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.21 2007/03/05 12:39:49 pjd Exp $
+.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.22 2007/09/01 06:33:01 pjd Exp $
.\"
.Dd September 16, 2006
.Dt GELI 8
@@ -146,7 +146,8 @@
.It
Supports many cryptographic algorithms (currently
.Nm AES ,
-.Nm Blowfish
+.Nm Blowfish ,
+.Nm Camellia
and
.Nm 3DES ) .
.It
@@ -227,7 +228,8 @@
Encryption algorithm to use.
Currently supported algorithms are:
.Nm AES ,
-.Nm Blowfish
+.Nm Blowfish ,
+.Nm Camellia
and
.Nm 3DES .
The default is
@@ -260,7 +262,9 @@
128 for
.Nm AES ,
128 for
-.Nm Blowfish
+.Nm Blowfish ,
+128 for
+.Nm Camellia
and 192 for
.Nm 3DES .
.It Fl s Ar sectorsize
@@ -652,5 +656,9 @@
.Nm
utility appeared in
.Fx 6.0 .
+Support for
+.Nm Camellia
+block cipher is implemented by Yoshisato Yanagisawa in
+.Fx 7.0 .
.Sh AUTHORS
.An Pawel Jakub Dawidek Aq pjd at FreeBSD.org
==== //depot/projects/ethng/src/sbin/ipfw/ipfw2.c#2 (text+ko) ====
@@ -17,7 +17,7 @@
*
* NEW command line interface for IP firewall facility
*
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.106 2007/06/18 17:52:37 maxim Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.107 2007/08/26 18:38:31 maxim Exp $
*/
#include <sys/param.h>
@@ -2575,7 +2575,7 @@
for (n = 0, d = dynrules; n < ndyn; n++, d++) {
if (use_set) {
/* skip rules from another set */
- bcopy(&d->rule + sizeof(uint16_t),
+ bcopy((char *)&d->rule + sizeof(uint16_t),
&set, sizeof(uint8_t));
if (set != use_set - 1)
continue;
@@ -2603,7 +2603,7 @@
printf("## Dynamic rules (%d):\n", ndyn);
for (n = 0, d = dynrules; n < ndyn; n++, d++) {
if (use_set) {
- bcopy(&d->rule + sizeof(uint16_t),
+ bcopy((char *)&d->rule + sizeof(uint16_t),
&set, sizeof(uint8_t));
if (set != use_set - 1)
continue;
@@ -2660,7 +2660,7 @@
if (rulenum > rnum)
break;
if (use_set) {
- bcopy(&d->rule + sizeof(uint16_t),
+ bcopy((char *)&d->rule + sizeof(uint16_t),
&set, sizeof(uint8_t));
if (set != use_set - 1)
continue;
==== //depot/projects/ethng/src/share/man/man4/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.392 2007/08/23 20:05:09 des Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.393 2007/09/02 07:09:25 imp Exp $
MAN= aac.4 \
acpi.4 \
@@ -415,7 +415,8 @@
xe.4 \
xl.4 \
xpt.4 \
- zero.4
+ zero.4 \
+ zyd.4
MLINKS= agp.4 agpgart.4
MLINKS+=altq.4 ALTQ.4
==== //depot/projects/ethng/src/share/man/man5/src.conf.5#2 (text) ====
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: src/tools/build/options/makeman,v 1.6 2006/09/11 13:39:44 ru Exp
-.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.13 2007/07/19 17:02:24 bz Exp $
-.Dd July 19, 2007
+.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.15 2007/08/27 20:22:59 remko Exp $
+.Dd August 27, 2007
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -564,6 +564,9 @@
.It Va WITHOUT_ZFS
.\" from FreeBSD: src/tools/build/options/WITHOUT_ZFS,v 1.1 2007/04/06 02:13:30 pjd Exp
Set to not build ZFS file system.
+.It Va WITHOUT_ZONEINFO
+.\" from FreeBSD: src/tools/build/options/WITHOUT_ZONEINFO,v 1.1 2007/08/27 20:01:08 remko Exp
+Set to not build the timezone database
.El
.Sh FILES
.Bl -tag -compact
==== //depot/projects/ethng/src/share/man/man9/suser.9#2 (text+ko) ====
@@ -27,9 +27,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/suser.9,v 1.33 2007/06/26 23:12:05 rwatson Exp $
+.\" $FreeBSD: src/share/man/man9/suser.9,v 1.34 2007/08/30 15:03:21 danger Exp $
.\"
-.Dd November 6, 2006
+.Dd August 30, 2007
.Dt SUSER 9
.Os
.Sh NAME
@@ -37,8 +37,7 @@
.Nm suser_cred
.Nd check if credentials have superuser privileges
.Sh SYNOPSIS
-.In sys/param.h
-.In sys/systm.h
+.In sys/priv.h
.Ft int
.Fn suser "struct thread *td"
.Ft int
==== //depot/projects/ethng/src/sys/amd64/linux32/linux32_proto.h#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.31 2007/03/30 00:08:21 jkim Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.32 2007/08/28 12:36:23 kib Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -734,6 +734,11 @@
char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)];
char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)];
};
+struct linux_sched_getaffinity_args {
+ char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
+ char len_l_[PADL_(l_uint)]; l_uint len; char len_r_[PADR_(l_uint)];
+ char user_mask_ptr_l_[PADL_(l_ulong *)]; l_ulong * user_mask_ptr; char user_mask_ptr_r_[PADR_(l_ulong *)];
+};
struct linux_set_thread_area_args {
char desc_l_[PADL_(struct l_user_desc *)]; struct l_user_desc * desc; char desc_r_[PADR_(struct l_user_desc *)];
};
@@ -1099,6 +1104,7 @@
int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *);
int linux_tkill(struct thread *, struct linux_tkill_args *);
int linux_sys_futex(struct thread *, struct linux_sys_futex_args *);
+int linux_sched_getaffinity(struct thread *, struct linux_sched_getaffinity_args *);
int linux_set_thread_area(struct thread *, struct linux_set_thread_area_args *);
int linux_fadvise64(struct thread *, struct linux_fadvise64_args *);
int linux_exit_group(struct thread *, struct linux_exit_group_args *);
@@ -1172,6 +1178,13 @@
#endif /* COMPAT_FREEBSD4 */
+
+#ifdef COMPAT_FREEBSD6
+
+#define nosys linux_nosys
+
+#endif /* COMPAT_FREEBSD6 */
+
#define LINUX_SYS_AUE_linux_fork AUE_FORK
#define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC
#define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4
@@ -1346,6 +1359,7 @@
#define LINUX_SYS_AUE_linux_fremovexattr AUE_NULL
#define LINUX_SYS_AUE_linux_tkill AUE_NULL
#define LINUX_SYS_AUE_linux_sys_futex AUE_NULL
+#define LINUX_SYS_AUE_linux_sched_getaffinity AUE_NULL
#define LINUX_SYS_AUE_linux_set_thread_area AUE_NULL
#define LINUX_SYS_AUE_linux_fadvise64 AUE_NULL
#define LINUX_SYS_AUE_linux_exit_group AUE_EXIT
==== //depot/projects/ethng/src/sys/amd64/linux32/linux32_syscall.h#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.31 2007/03/30 00:08:21 jkim Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.32 2007/08/28 12:36:23 kib Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp
*/
#define LINUX_SYS_exit 1
@@ -222,6 +222,7 @@
#define LINUX_SYS_linux_fremovexattr 237
#define LINUX_SYS_linux_tkill 238
#define LINUX_SYS_linux_sys_futex 240
+#define LINUX_SYS_linux_sched_getaffinity 242
#define LINUX_SYS_linux_set_thread_area 243
#define LINUX_SYS_linux_fadvise64 250
#define LINUX_SYS_linux_exit_group 252
==== //depot/projects/ethng/src/sys/amd64/linux32/linux32_sysent.c#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.31 2007/03/30 00:08:21 jkim Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.32 2007/08/28 12:36:23 kib Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp
*/
#include <bsm/audit_kevents.h>
@@ -262,7 +262,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */
{ AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */
+ { AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */
{ AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */
==== //depot/projects/ethng/src/sys/amd64/linux32/syscalls.master#2 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -408,7 +408,8 @@
240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, int val, \
struct l_timespec *timeout, void *uaddr2, int val3); }
241 AUE_NULL UNIMPL linux_sched_setaffinity
-242 AUE_NULL UNIMPL linux_sched_getaffinity
+242 AUE_NULL STD { int linux_sched_getaffinity(l_pid_t pid, l_uint len, \
+ l_ulong *user_mask_ptr); }
243 AUE_NULL STD { int linux_set_thread_area(struct l_user_desc *desc); }
244 AUE_NULL UNIMPL linux_get_thread_area
245 AUE_NULL UNIMPL linux_io_setup
==== //depot/projects/ethng/src/sys/arm/xscale/i80321/i80321.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.6 2006/07/25 01:08:41 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.7 2007/09/04 18:45:27 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -213,8 +213,6 @@
PCIM_CMD_SERRESPEN;
bus_space_write_4(sc->sc_st, sc->sc_atu_sh,
PCIR_COMMAND, preg);
- preg = bus_space_read_4(sc->sc_st, sc->sc_atu_sh,
- PCIR_COMMAND);
}
/* Initialize the bus space tags. */
i80321_io_bs_init(&sc->sc_pci_iot, sc);
==== //depot/projects/ethng/src/sys/compat/freebsd32/freebsd32_misc.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.66 2007/07/04 23:04:41 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.67 2007/08/28 20:28:11 jhb Exp $");
#include "opt_compat.h"
@@ -135,28 +135,28 @@
static void
copy_statfs(struct statfs *in, struct statfs32 *out)
{
-
+
+ statfs_scale_blocks(in, INT32_MAX);
bzero(out, sizeof(*out));
CP(*in, *out, f_bsize);
- CP(*in, *out, f_iosize);
+ out->f_iosize = MIN(in->f_iosize, INT32_MAX);
CP(*in, *out, f_blocks);
CP(*in, *out, f_bfree);
CP(*in, *out, f_bavail);
- CP(*in, *out, f_files);
- CP(*in, *out, f_ffree);
+ out->f_files = MIN(in->f_files, INT32_MAX);
+ out->f_ffree = MIN(in->f_ffree, INT32_MAX);
CP(*in, *out, f_fsid);
CP(*in, *out, f_owner);
CP(*in, *out, f_type);
CP(*in, *out, f_flags);
- CP(*in, *out, f_flags);
- CP(*in, *out, f_syncwrites);
- CP(*in, *out, f_asyncwrites);
+ out->f_syncwrites = MIN(in->f_syncwrites, INT32_MAX);
+ out->f_asyncwrites = MIN(in->f_asyncwrites, INT32_MAX);
strlcpy(out->f_fstypename,
in->f_fstypename, MFSNAMELEN);
strlcpy(out->f_mntonname,
in->f_mntonname, min(MNAMELEN, FREEBSD4_MNAMELEN));
- CP(*in, *out, f_syncreads);
- CP(*in, *out, f_asyncreads);
+ out->f_syncreads = MIN(in->f_syncreads, INT32_MAX);
+ out->f_asyncreads = MIN(in->f_asyncreads, INT32_MAX);
strlcpy(out->f_mntfromname,
in->f_mntfromname, min(MNAMELEN, FREEBSD4_MNAMELEN));
}
==== //depot/projects/ethng/src/sys/compat/linux/linux_misc.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.213 2007/06/12 00:11:57 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.214 2007/08/28 12:26:35 kib Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -1713,3 +1713,24 @@
return (error);
}
+
+/*
+ * XXX: fake one.. waiting for real implementation of affinity mask.
+ */
+int
+linux_sched_getaffinity(struct thread *td,
+ struct linux_sched_getaffinity_args *args)
+{
+ int error;
+ cpumask_t i = ~0;
+
+ if (args->len < sizeof(cpumask_t))
+ return (EINVAL);
+
+ error = copyout(&i, args->user_mask_ptr, sizeof(cpumask_t));
+ if (error)
+ return (EFAULT);
+
+ td->td_retval[0] = sizeof(cpumask_t);
+ return (0);
+}
==== //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 (text+ko) ====
@@ -155,9 +155,9 @@
TUNABLE_ULONG("vfs.zfs.arc_max", &zfs_arc_max);
TUNABLE_ULONG("vfs.zfs.arc_min", &zfs_arc_min);
SYSCTL_DECL(_vfs_zfs);
-SYSCTL_ULONG(_vfs_zfs, OID_AUTO, arc_max, CTLFLAG_RD, &zfs_arc_max, 0,
+SYSCTL_ULONG(_vfs_zfs, OID_AUTO, arc_max, CTLFLAG_RDTUN, &zfs_arc_max, 0,
"Maximum ARC size");
-SYSCTL_ULONG(_vfs_zfs, OID_AUTO, arc_min, CTLFLAG_RD, &zfs_arc_min, 0,
+SYSCTL_ULONG(_vfs_zfs, OID_AUTO, arc_min, CTLFLAG_RDTUN, &zfs_arc_min, 0,
"Minimum ARC size");
/*
==== //depot/projects/ethng/src/sys/dev/acpica/acpi_cpu.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.66 2007/06/03 00:40:56 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.67 2007/08/30 21:18:42 njl Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -257,7 +257,7 @@
acpi_cpu_attach(device_t dev)
{
ACPI_BUFFER buf;
- ACPI_OBJECT arg, *obj;
+ ACPI_OBJECT arg[4], *obj;
ACPI_OBJECT_LIST arglist;
struct pcpu *pcpu_data;
struct acpi_cpu_softc *sc;
@@ -268,6 +268,11 @@
driver_t **drivers;
uint32_t cap_set[3];
+ /* UUID needed by _OSC evaluation */
+ static uint8_t cpu_oscuuid[16] = { 0x16, 0xA6, 0x77, 0x40, 0x0C, 0x29,
+ 0xBE, 0x47, 0x9E, 0xBD, 0xD8, 0x70,
+ 0x58, 0x71, 0x39, 0x53 };
+
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
sc = device_get_softc(dev);
@@ -334,19 +339,39 @@
/*
* CPU capabilities are specified as a buffer of 32-bit integers:
* revision, count, and one or more capabilities. The revision of
- * "1" is not specified anywhere but seems to match Linux. We should
- * also support _OSC here.
+ * "1" is not specified anywhere but seems to match Linux.
*/
if (sc->cpu_features) {
- arglist.Pointer = &arg;
+ arglist.Pointer = arg;
arglist.Count = 1;
- arg.Type = ACPI_TYPE_BUFFER;
- arg.Buffer.Length = sizeof(cap_set);
- arg.Buffer.Pointer = (uint8_t *)cap_set;
+ arg[0].Type = ACPI_TYPE_BUFFER;
+ arg[0].Buffer.Length = sizeof(cap_set);
+ arg[0].Buffer.Pointer = (uint8_t *)cap_set;
cap_set[0] = 1; /* revision */
cap_set[1] = 1; /* number of capabilities integers */
cap_set[2] = sc->cpu_features;
AcpiEvaluateObject(sc->cpu_handle, "_PDC", &arglist, NULL);
+
+ /*
+ * On some systems we need to evaluate _OSC so that the ASL
+ * loads the _PSS and/or _PDC methods at runtime.
+ *
+ * TODO: evaluate failure of _OSC.
+ */
+ arglist.Pointer = arg;
+ arglist.Count = 4;
+ arg[0].Type = ACPI_TYPE_BUFFER;
+ arg[0].Buffer.Length = sizeof(cpu_oscuuid);
+ arg[0].Buffer.Pointer = cpu_oscuuid; /* UUID */
+ arg[1].Type = ACPI_TYPE_INTEGER;
+ arg[1].Integer.Value = 1; /* revision */
+ arg[2].Type = ACPI_TYPE_INTEGER;
+ arg[2].Integer.Value = 1; /* count */
+ arg[3].Type = ACPI_TYPE_BUFFER;
+ arg[3].Buffer.Length = sizeof(cap_set); /* Capabilities buffer */
+ arg[3].Buffer.Pointer = (uint8_t *)cap_set;
+ cap_set[0] = 0;
+ AcpiEvaluateObject(sc->cpu_handle, "_OSC", &arglist, NULL);
}
/* Probe for Cx state support. */
==== //depot/projects/ethng/src/sys/dev/isp/isp_freebsd.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.106 2007/07/02 20:08:20 mjacob Exp $ */
+/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.107 2007/08/28 00:09:12 jkim Exp $ */
/*-
* Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
*
@@ -184,8 +184,8 @@
const struct firmware * fw;
union {
struct {
- char wwnn[17];
- char wwpn[17];
+ char wwnn[19];
+ char wwpn[19];
} fc;
} sysctl_info;
#endif
==== //depot/projects/ethng/src/sys/dev/iwi/if_iwi.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.55 2007/06/25 20:56:33 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.56 2007/08/29 21:52:03 thompsa Exp $");
/*-
* Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -957,7 +957,6 @@
struct iwi_softc *sc = ifp->if_softc;
int error = 0;
- IWI_LOCK_ASSERT(sc);
DPRINTF(("%s: %s -> %s flags 0x%x\n", __func__,
ieee80211_state_name[ic->ic_state],
ieee80211_state_name[nstate], sc->flags));
==== //depot/projects/ethng/src/sys/dev/ixgbe/ixgbe.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
-/* $FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.3 2007/07/12 19:04:11 jfv Exp $ */
+/* $FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.4 2007/09/04 02:31:34 jfv Exp $ */
#ifdef HAVE_KERNEL_OPTION_HEADERS
#include "opt_device_polling.h"
@@ -46,7 +46,7 @@
/*********************************************************************
* Driver version
*********************************************************************/
-char ixgbe_driver_version[] = "1.1.3";
+char ixgbe_driver_version[] = "1.2.6";
/*********************************************************************
* PCI Device ID Table
@@ -60,10 +60,9 @@
static ixgbe_vendor_info_t ixgbe_vendor_info_array[] =
{
- {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598AF_DUAL_PORT, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598AF_SINGLE_PORT, 0, 0, 0},
- {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598AT_DUAL_PORT, 0, 0, 0},
+ {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598EB_CX4, 0, 0, 0},
/* required last entry */
{0, 0, 0, 0, 0}
};
@@ -100,8 +99,9 @@
static void ixgbe_setup_interface(device_t, struct adapter *);
static int ixgbe_allocate_queues(struct adapter *);
static int ixgbe_allocate_msix_resources(struct adapter *);
+#if __FreeBSD_version >= 700000
static int ixgbe_setup_msix(struct adapter *);
-
+#endif
static int ixgbe_allocate_transmit_buffers(struct tx_ring *);
static int ixgbe_setup_transmit_structures(struct adapter *);
static void ixgbe_setup_transmit_ring(struct tx_ring *);
@@ -119,7 +119,7 @@
static void ixgbe_enable_intr(struct adapter *);
static void ixgbe_disable_intr(struct adapter *);
static void ixgbe_update_stats_counters(struct adapter *);
-static boolean_t ixgbe_txeof(struct tx_ring *);
+static bool ixgbe_txeof(struct tx_ring *);
static int ixgbe_rxeof(struct rx_ring *, int);
static void ixgbe_rx_checksum(struct adapter *, uint32_t, struct mbuf *);
static void ixgbe_set_promisc(struct adapter *);
@@ -133,6 +133,7 @@
static int ixgbe_encap(struct adapter *, struct mbuf **);
static int ixgbe_sysctl_stats(SYSCTL_HANDLER_ARGS);
static int ixgbe_sysctl_debug(SYSCTL_HANDLER_ARGS);
+static int ixgbe_set_flowcntl(SYSCTL_HANDLER_ARGS);
static int ixgbe_dma_malloc(struct adapter *, bus_size_t,
struct ixgbe_dma_alloc *, int);
static void ixgbe_dma_free(struct adapter *, struct ixgbe_dma_alloc *);
@@ -143,14 +144,23 @@
static void ixgbe_set_ivar(struct adapter *, u16, u8);
static void ixgbe_configure_ivars(struct adapter *);
-/* Legacy Interrupt handler */
-static void ixgbe_intr(void *);
+/* Legacy Fast Interrupt routine and handlers */
+#if __FreeBSD_version >= 700000
+static int ixgbe_fast_irq(void *);
+/* The MSI/X Interrupt handlers */
+static void ixgbe_msix_tx(void *);
+static void ixgbe_msix_rx(void *);
+static void ixgbe_msix_link(void *);
+#else
+static void ixgbe_fast_irq(void *);
+#endif
-/* The MSI/X Interrupt handlers */
-static void ixgbe_txint(void *);
-static void ixgbe_rxint(void *);
-static void ixgbe_linkint(void *);
+static void ixgbe_rxtx(void *context, int pending);
+static void ixgbe_link(void *context, int pending);
+#ifndef NO_82598_A0_SUPPORT
+static void desc_flip(void *);
+#endif
/*********************************************************************
* FreeBSD Device Interface Entry Points
@@ -175,26 +185,40 @@
MODULE_DEPEND(ixgbe, pci, 1, 1, 1);
MODULE_DEPEND(ixgbe, ether, 1, 1, 1);
+/*
+** TUNEABLE PARAMETERS:
+*/
+
/* How many packets rxeof tries to clean at a time */
static int ixgbe_rx_process_limit = 100;
TUNABLE_INT("hw.ixgbe.rx_process_limit", &ixgbe_rx_process_limit);
-/*
- * Should the driver do MSI/X and RSS/MQ?
- * - default to MSI/X and RSS enabled
- */
-static int ixgbe_disable_msix = 0;
-TUNABLE_INT("hw.ixgbe.disable_msix", &ixgbe_disable_msix);
+/* Flow control setting, default to full */
+static int ixgbe_flow_control = 3;
+TUNABLE_INT("hw.ixgbe.flow_control", &ixgbe_flow_control);
+
+/* Number of TX Queues, note multi tx is not working */
+static int ixgbe_tx_queues = 1;
+TUNABLE_INT("hw.ixgbe.tx_queues", &ixgbe_tx_queues);
+
+/* Number of RX Queues */
+static int ixgbe_rx_queues = 8;
+TUNABLE_INT("hw.ixgbe.rx_queues", &ixgbe_rx_queues);
+
+/* Number of Other Queues, this is used for link interrupts */
+static int ixgbe_other_queues = 1;
+TUNABLE_INT("hw.ixgbe.other_queues", &ixgbe_other_queues);
+
+/* Number of TX descriptors per ring */
+static int ixgbe_txd = DEFAULT_TXD;
+TUNABLE_INT("hw.ixgbe.txd", &ixgbe_txd);
+
+/* Number of RX descriptors per ring */
+static int ixgbe_rxd = DEFAULT_RXD;
+TUNABLE_INT("hw.ixgbe.rxd", &ixgbe_rxd);
-/*
-** Flow control tuneable:
-** 0 - off
-** 1 - rx pause
-** 2 - tx pause
-** 3 - full
-*/
-static int ixgbe_flow_control = 0;
-TUNABLE_INT("hw.ixgbe.flow_control", &ixgbe_flow_control);
+/* Total number of Interfaces - need for config sanity check */
+static int ixgbe_total_ports;
/*********************************************************************
* Device identification routine
@@ -239,6 +263,15 @@
sprintf(adapter_name, "%s, Version - %s",
ixgbe_strings[ent->index],
ixgbe_driver_version);
+ switch (pci_device_id) {
+ case IXGBE_DEV_ID_82598AF_DUAL_PORT :
+ ixgbe_total_ports += 2;
+ break;
+ case IXGBE_DEV_ID_82598AF_SINGLE_PORT :
+ ixgbe_total_ports += 1;
+ default:
+ break;
+ }
device_set_desc_copy(dev, adapter_name);
return (0);
}
@@ -264,13 +297,17 @@
struct adapter *adapter;
int error = 0;
uint32_t ctrl_ext;
+ char name_string[16];
INIT_DEBUGOUT("ixgbe_attach: begin");
/* Allocate, clear, and link in our adapter structure */
adapter = device_get_softc(dev);
adapter->dev = adapter->osdep.dev = dev;
- IXGBE_LOCK_INIT(adapter, device_get_nameunit(dev));
+ /* General Lock Init*/
+ snprintf(name_string, sizeof(name_string), "%s:core",
+ device_get_nameunit(dev));
+ mtx_init(&adapter->core_mtx, name_string, NULL, MTX_DEF);
/* SYSCTL APIs */
SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
@@ -283,25 +320,17 @@
OID_AUTO, "debug", CTLTYPE_INT | CTLFLAG_RW,
adapter, 0, ixgbe_sysctl_debug, "I", "Debug Info");
- SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list