PERFORCE change 121516 for review
Andrew Thompson
thompsa at FreeBSD.org
Tue Jun 12 18:53:56 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=121516
Change 121516 by thompsa at thompsa_heff on 2007/06/12 18:53:18
IFC (hopefully unbreak build)
Affected files ...
.. //depot/projects/wifi/UPDATING#33 integrate
.. //depot/projects/wifi/etc/defaults/rc.conf#31 integrate
.. //depot/projects/wifi/etc/rc.d/sendmail#5 integrate
.. //depot/projects/wifi/games/fortune/datfiles/fortunes#25 integrate
.. //depot/projects/wifi/lib/libc/net/Makefile.inc#9 integrate
.. //depot/projects/wifi/lib/libc/net/Symbol.map#7 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate
.. //depot/projects/wifi/sbin/ifconfig/iflagg.c#2 integrate
.. //depot/projects/wifi/share/man/man4/ip.4#10 integrate
.. //depot/projects/wifi/share/man/man4/snd_hda.4#5 integrate
.. //depot/projects/wifi/share/misc/committers-ports.dot#6 integrate
.. //depot/projects/wifi/sys/conf/files#54 integrate
.. //depot/projects/wifi/sys/dev/if_ndis/if_ndis_usb.c#4 integrate
.. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#54 edit
.. //depot/projects/wifi/sys/dev/msk/if_mskreg.h#5 integrate
.. //depot/projects/wifi/sys/dev/nfe/if_nfereg.h#4 integrate
.. //depot/projects/wifi/sys/dev/sound/usb/uaudio.c#17 integrate
.. //depot/projects/wifi/sys/dev/usb/if_aue.c#14 integrate
.. //depot/projects/wifi/sys/dev/usb/if_axe.c#19 integrate
.. //depot/projects/wifi/sys/dev/usb/if_cdce.c#9 integrate
.. //depot/projects/wifi/sys/dev/usb/if_cue.c#13 integrate
.. //depot/projects/wifi/sys/dev/usb/if_kue.c#13 integrate
.. //depot/projects/wifi/sys/dev/usb/if_rue.c#13 integrate
.. //depot/projects/wifi/sys/dev/usb/if_rum.c#4 integrate
.. //depot/projects/wifi/sys/dev/usb/if_udav.c#15 integrate
.. //depot/projects/wifi/sys/dev/usb/if_ural.c#29 integrate
.. //depot/projects/wifi/sys/dev/usb/uark.c#4 integrate
.. //depot/projects/wifi/sys/dev/usb/ubsa.c#8 integrate
.. //depot/projects/wifi/sys/dev/usb/ubser.c#8 integrate
.. //depot/projects/wifi/sys/dev/usb/ucom.c#8 integrate
.. //depot/projects/wifi/sys/dev/usb/ucomvar.h#4 integrate
.. //depot/projects/wifi/sys/dev/usb/udbp.c#5 integrate
.. //depot/projects/wifi/sys/dev/usb/ufm.c#6 integrate
.. //depot/projects/wifi/sys/dev/usb/uftdi.c#8 integrate
.. //depot/projects/wifi/sys/dev/usb/uhid.c#10 integrate
.. //depot/projects/wifi/sys/dev/usb/uhub.c#10 integrate
.. //depot/projects/wifi/sys/dev/usb/ukbd.c#9 integrate
.. //depot/projects/wifi/sys/dev/usb/ulpt.c#7 integrate
.. //depot/projects/wifi/sys/dev/usb/umass.c#14 integrate
.. //depot/projects/wifi/sys/dev/usb/umct.c#6 integrate
.. //depot/projects/wifi/sys/dev/usb/umodem.c#8 integrate
.. //depot/projects/wifi/sys/dev/usb/ums.c#12 integrate
.. //depot/projects/wifi/sys/dev/usb/uplcom.c#13 integrate
.. //depot/projects/wifi/sys/dev/usb/urio.c#6 integrate
.. //depot/projects/wifi/sys/dev/usb/usb.c#12 integrate
.. //depot/projects/wifi/sys/dev/usb/usb_port.h#9 integrate
.. //depot/projects/wifi/sys/dev/usb/uscanner.c#10 integrate
.. //depot/projects/wifi/sys/dev/usb/uvisor.c#9 integrate
.. //depot/projects/wifi/sys/dev/usb/uvscom.c#8 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#9 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate
.. //depot/projects/wifi/sys/netinet/igmp.h#3 integrate
.. //depot/projects/wifi/sys/netinet/igmp_var.h#3 integrate
.. //depot/projects/wifi/sys/netinet/in.c#16 integrate
.. //depot/projects/wifi/sys/netinet/in.h#11 integrate
.. //depot/projects/wifi/sys/netinet/in_mcast.c#1 branch
.. //depot/projects/wifi/sys/netinet/in_pcb.c#17 integrate
.. //depot/projects/wifi/sys/netinet/in_var.h#7 integrate
.. //depot/projects/wifi/sys/netinet/ip_carp.c#17 integrate
.. //depot/projects/wifi/sys/netinet/ip_output.c#19 integrate
.. //depot/projects/wifi/sys/netinet/ip_var.h#8 integrate
.. //depot/projects/wifi/sys/netinet/sctp.h#7 integrate
.. //depot/projects/wifi/sys/netinet/sctp_constants.h#12 integrate
.. //depot/projects/wifi/sys/netinet/sctp_header.h#5 integrate
.. //depot/projects/wifi/sys/netinet/sctp_input.c#13 integrate
.. //depot/projects/wifi/sys/netinet/sctp_os_bsd.h#11 integrate
.. //depot/projects/wifi/sys/netinet/sctp_output.c#13 integrate
.. //depot/projects/wifi/sys/netinet/sctp_pcb.c#14 integrate
.. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#12 integrate
.. //depot/projects/wifi/sys/netinet/sctputil.c#13 integrate
.. //depot/projects/wifi/sys/netinet/sctputil.h#11 integrate
.. //depot/projects/wifi/sys/netinet/udp_usrreq.c#21 integrate
.. //depot/projects/wifi/sys/netinet/udp_var.h#4 integrate
.. //depot/projects/wifi/sys/netinet6/in6.h#9 integrate
.. //depot/projects/wifi/sys/netinet6/in6_ifattach.c#10 integrate
.. //depot/projects/wifi/sys/netinet6/in6_pcb.c#11 integrate
.. //depot/projects/wifi/sys/netinet6/sctp6_var.h#5 integrate
.. //depot/projects/wifi/sys/sys/param.h#31 integrate
.. //depot/projects/wifi/sys/sys/socket.h#10 integrate
.. //depot/projects/wifi/tools/regression/netinet/ipmulticast/Makefile#1 branch
.. //depot/projects/wifi/tools/regression/netinet/ipmulticast/ipmulticast.c#1 branch
.. //depot/projects/wifi/tools/regression/netinet/ipsockopt/ipsockopt.c#6 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/sed/regress.sh#5 integrate
.. //depot/projects/wifi/tools/tools/nanobsd/nanobsd.sh#10 integrate
.. //depot/projects/wifi/usr.bin/netstat/inet.c#10 integrate
.. //depot/projects/wifi/usr.bin/sed/extern.h#3 integrate
.. //depot/projects/wifi/usr.bin/sed/main.c#6 integrate
.. //depot/projects/wifi/usr.bin/sed/process.c#6 integrate
.. //depot/projects/wifi/usr.sbin/mtest/mtest.c#3 integrate
.. //depot/projects/wifi/usr.sbin/ntp/doc/ntpd.8#6 integrate
Differences ...
==== //depot/projects/wifi/UPDATING#33 (text+ko) ====
@@ -21,6 +21,31 @@
developers choose to disable these features on build machines
to maximize performance.
+20070612:
+ By default, /etc/rc.d/sendmail no longer rebuilds the aliases
+ database if it is missing or older than the aliases file. If
+ desired, set the new rc.conf option sendmail_rebuild_aliases
+ to "YES" to restore that functionality.
+
+20070612:
+ The IPv4 multicast socket code has been considerably modified, and
+ moved to the file sys/netinet/in_mcast.c. Initial support for the
+ RFC 3678 Source-Specific Multicast Socket API has been added to
+ the IPv4 network stack.
+
+ Strict multicast and broadcast reception is now the default for
+ UDP/IPv4 sockets; the net.inet.udp.strict_mcast_mship sysctl variable
+ has now been removed.
+
+ The RFC 1724 hack for interface selection has been removed; the use
+ of the Linux-derived ip_mreqn structure with IP_MULTICAST_IF has
+ been added to replace it. Consumers such as routed will soon be
+ updated to reflect this.
+
+ These changes affect users who are running routed(8) or rdisc(8)
+ from the FreeBSD base system on point-to-point or unnumbered
+ interfaces.
+
20070610:
The net80211 layer has changed significantly and all wireless
drivers that depend on it need to be recompiled. Further these
@@ -81,10 +106,10 @@
DEFAULT_THREAD_LIB=libpthread for the buildworld.
20070423:
- The ABI breakage in sendmail(8)'s libmilter has been repaired
- so it is no longer necessary to recompile mail filters (aka,
- milters). If you recompiled mail filters after the 20070408
- note, it is not necessary to recompile them again.
+ The ABI breakage in sendmail(8)'s libmilter has been repaired
+ so it is no longer necessary to recompile mail filters (aka,
+ milters). If you recompiled mail filters after the 20070408
+ note, it is not necessary to recompile them again.
20070417:
The new trunk(4) driver has been renamed to lagg(4) as it better
@@ -832,4 +857,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.494 2007/06/11 04:06:50 sam Exp $
+$FreeBSD: src/UPDATING,v 1.497 2007/06/12 17:33:56 gshapiro Exp $
==== //depot/projects/wifi/etc/defaults/rc.conf#31 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.315 2007/05/29 06:22:14 dougb Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.316 2007/06/12 17:33:23 gshapiro Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -483,6 +483,7 @@
sendmail_msp_queue_enable="YES" # Dequeue stuck clientmqueue mail (YES/NO).
sendmail_msp_queue_flags="-L sm-msp-queue -Ac -q30m"
# Flags for sendmail_msp_queue daemon.
+sendmail_rebuild_aliases="NO" # Run newaliases if necessary (YES/NO).
##############################################################
==== //depot/projects/wifi/etc/rc.d/sendmail#5 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: sendmail,v 1.14 2002/02/12 01:26:36 lukem Exp $
-# $FreeBSD: src/etc/rc.d/sendmail,v 1.16 2005/10/28 16:55:38 yar Exp $
+# $FreeBSD: src/etc/rc.d/sendmail,v 1.17 2007/06/12 17:33:23 gshapiro Exp $
#
# PROVIDE: mail
@@ -58,16 +58,18 @@
fi
# check modifications on /etc/mail/aliases
- if [ -f "/etc/mail/aliases.db" ]; then
- if [ "/etc/mail/aliases" -nt "/etc/mail/aliases.db" ]; then
+ if checkyesno sendmail_rebuild_aliases; then
+ if [ -f "/etc/mail/aliases.db" ]; then
+ if [ "/etc/mail/aliases" -nt "/etc/mail/aliases.db" ]; then
+ echo \
+ "${name}: /etc/mail/aliases newer than /etc/mail/aliases.db, regenerating"
+ /usr/bin/newaliases
+ fi
+ else
echo \
- "${name}: /etc/mail/aliases newer than /etc/mail/aliases.db, regenerating"
- /usr/bin/newaliases
+ "${name}: /etc/mail/aliases.db not present, generating"
+ /usr/bin/newaliases
fi
- else
- echo \
- "${name}: /etc/mail/aliases.db not present, generating"
- /usr/bin/newaliases
fi
}
==== //depot/projects/wifi/games/fortune/datfiles/fortunes#25 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.240 2007/06/06 11:12:56 ceri Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.241 2007/06/12 09:20:31 philip Exp $
%
=======================================================================
@@ -13268,11 +13268,6 @@
Bucy's Law:
Nothing is ever accomplished by a reasonable man.
%
-Bug:
- An elusive creature living in a program that makes it incorrect.
- The activity of "debugging," or removing bugs from a program, ends
- when people get tired of doing it, not when the bugs are removed.
-%
Bug, n.:
An aspect of a computer program which exists because the
programmer was thinking about Jumbo Jacks or stock options when s/he
==== //depot/projects/wifi/lib/libc/net/Makefile.inc#9 (text+ko) ====
@@ -1,5 +1,5 @@
# from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
-# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.66 2007/06/11 07:21:21 delphij Exp $
+# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.67 2007/06/12 16:24:55 bms Exp $
# machine-independent net sources
.PATH: ${.CURDIR}/net
@@ -14,7 +14,7 @@
ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \
nsdispatch.c nslexer.c nsparser.c nss_compat.c \
rcmd.c rcmdsh.c recv.c rthdr.c sctp_sys_calls.c send.c \
- sockatmark.c vars.c
+ sockatmark.c sourcefilter.c vars.c
.if ${MK_NS_CACHING} != "no"
SRCS+= nscache.c nscachedcli.c
@@ -52,6 +52,7 @@
inet6_opt_init.3 inet6_option_space.3 inet6_rth_space.3 \
inet6_rthdr_space.3 linkaddr.3 \
nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3 sockatmark.3 \
+ setsourcefilter.3 \
sctp_bindx.3 sctp_connectx.3 sctp_freepaddrs.3 \
sctp_getaddrlen.3 sctp_getassocid.3 sctp_getpaddrs.3 \
sctp_opt_info.3 sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3 \
@@ -121,6 +122,8 @@
resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \
resolver.3 ns_get16.3 resolver.3 ns_get32.3 \
resolver.3 ns_put16.3 resolver.3 ns_put32.3
+MLINKS+=sourcefilter.3 setipv4sourcefilter.3 getipv4sourcefilter.3 \
+ sourcefilter.3 setsourcefilter.3 getsourcefilter.3
.if ${MK_HESIOD} != "no"
SRCS+= hesiod.c
==== //depot/projects/wifi/lib/libc/net/Symbol.map#7 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.16 2007/05/31 13:01:33 deischen Exp $
+ * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.17 2007/06/12 16:24:55 bms Exp $
*/
FBSD_1.0 {
@@ -137,6 +137,10 @@
sctp_send;
sctp_sendx;
sctp_recvmsg;
+ setipv4sourcefilter;
+ getipv4sourcefilter;
+ getsourcefilter;
+ setsourcefilter;
};
FBSDprivate_1.0 {
==== //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 (text+ko) ====
@@ -30,7 +30,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1038 2007/06/05 15:38:54 rafan Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1039 2007/06/12 17:33:23 gshapiro Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -2037,6 +2037,12 @@
<para>The <filename>ppp-user</filename> script has been renamed to
<filename>ppp</filename>. &merged;</para>
+ <para>The <filename>sendmail</filename> script no longer rebuilds
+ the aliases database if it is missing or older than the aliases
+ file. If desired, set the new rc.conf option
+ <varname>sendmail_rebuild_aliases</varname> to "YES" to restore
+ that functionality.</para>
+
<para>The <varname>removable_interfaces</varname> variable
has been removed.</para>
==== //depot/projects/wifi/sbin/ifconfig/iflagg.c#2 (text+ko) ====
@@ -3,7 +3,7 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/sbin/ifconfig/iflagg.c,v 1.1 2007/04/17 00:35:09 thompsa Exp $";
+ "$FreeBSD: src/sbin/ifconfig/iflagg.c,v 1.2 2007/06/12 10:07:57 thompsa Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -58,16 +58,16 @@
static void
setlaggproto(const char *val, int d, int s, const struct afswtch *afp)
{
- struct lagg_protos tpr[] = LAGG_PROTOS;
+ struct lagg_protos lpr[] = LAGG_PROTOS;
struct lagg_reqall ra;
int i;
bzero(&ra, sizeof(ra));
ra.ra_proto = LAGG_PROTO_MAX;
- for (i = 0; i < (sizeof(tpr) / sizeof(tpr[0])); i++) {
- if (strcmp(val, tpr[i].tpr_name) == 0) {
- ra.ra_proto = tpr[i].tpr_proto;
+ for (i = 0; i < (sizeof(lpr) / sizeof(lpr[0])); i++) {
+ if (strcmp(val, lpr[i].lpr_name) == 0) {
+ ra.ra_proto = lpr[i].lpr_proto;
break;
}
}
@@ -82,7 +82,7 @@
static void
lagg_status(int s)
{
- struct lagg_protos tpr[] = LAGG_PROTOS;
+ struct lagg_protos lpr[] = LAGG_PROTOS;
struct lagg_reqport rp, rpbuf[LAGG_MAX_PORTS];
struct lagg_reqall ra;
const char *proto = "<unknown>";
@@ -102,9 +102,9 @@
ra.ra_port = rpbuf;
if (ioctl(s, SIOCGLAGG, &ra) == 0) {
- for (i = 0; i < (sizeof(tpr) / sizeof(tpr[0])); i++) {
- if (ra.ra_proto == tpr[i].tpr_proto) {
- proto = tpr[i].tpr_name;
+ for (i = 0; i < (sizeof(lpr) / sizeof(lpr[0])); i++) {
+ if (ra.ra_proto == lpr[i].lpr_proto) {
+ proto = lpr[i].lpr_name;
break;
}
}
@@ -122,8 +122,8 @@
if (0 /* XXX */) {
printf("\tsupported aggregation protocols:\n");
- for (i = 0; i < (sizeof(tpr) / sizeof(tpr[0])); i++)
- printf("\t\tlaggproto %s\n", tpr[i].tpr_name);
+ for (i = 0; i < (sizeof(lpr) / sizeof(lpr[0])); i++)
+ printf("\t\tlaggproto %s\n", lpr[i].lpr_name);
}
} else if (isport)
printf("\tlagg: laggdev %s\n", rp.rp_ifname);
==== //depot/projects/wifi/share/man/man4/ip.4#10 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ip.4 8.2 (Berkeley) 11/30/93
-.\" $FreeBSD: src/share/man/man4/ip.4,v 1.48 2007/03/18 15:31:06 bms Exp $
+.\" $FreeBSD: src/share/man/man4/ip.4,v 1.49 2007/06/12 16:24:55 bms Exp $
.\"
-.Dd March 18, 2007
+.Dd April 9, 2007
.Dt IP 4
.Os
.Sh NAME
@@ -420,6 +420,16 @@
address of the desired interface or
.Dv INADDR_ANY
to specify the default interface.
+.Pp
+To specify an interface by index, an instance of
+.Vt ip_mreqn
+should be passed instead.
+The
+.Vt imr_ifindex
+member should be set to the index of the desired interface,
+or 0 to specify the default interface.
+The kernel differentiates between these two structures by their size.
+.\"
An interface's local IP address and multicast capability can
be obtained via the
.Dv SIOCGIFCONF
@@ -672,3 +682,7 @@
.Nm
protocol appeared in
.Bx 4.2 .
+The
+.Vt ip_mreqn
+structure appeared in
+.Tn Linux 2.4 .
==== //depot/projects/wifi/share/man/man4/snd_hda.4#5 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.10 2007/05/05 10:36:57 joel Exp $
+.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.11 2007/06/12 15:26:41 joel Exp $
.\"
-.Dd May 5, 2007
+.Dd June 12, 2007
.Dt SND_HDA 4
.Os
.Sh NAME
@@ -169,13 +169,15 @@
.Pp
.Bl -bullet -compact
.It
-Analog Device AD1981HD
+Analog Devices AD1981HD
+.It
+Analog Devices AD1983
.It
-Analog Device AD1983
+Analog Devices AD1986A
.It
-Analog Device AD1986A
+Analog Devices AD1988
.It
-Analog Device AD1988
+Analog Devices AD1988B
.It
CMedia CMI9880
.It
@@ -187,6 +189,8 @@
.It
Realtek ALC262
.It
+Realtek ALC660
+.It
Realtek ALC861
.It
Realtek ALC861VD
==== //depot/projects/wifi/share/misc/committers-ports.dot#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-ports.dot,v 1.57 2007/06/09 21:43:52 beech Exp $
+# $FreeBSD: src/share/misc/committers-ports.dot,v 1.58 2007/06/12 09:05:06 chinsan Exp $
# This file is meant to list all FreeBSD ports committers and describe the
# mentor-mentee relationships between them.
@@ -53,6 +53,7 @@
bland [label="Alexander Nedotsukov\nbland at FreeBSD.org\n2003/08/14"]
brooks [label="Brooks Davies\nbrooks at FreeBSD.org\n2004/05/03"]
bsam [label="Boris Samorodov\nbsam at FreeBSD.org\n2006/07/20"]
+chinsan [label="Chinsan Huang\nchinsan at FreeBSD.org\n2007/06/12"]
clement [label="Clement Laforet\nclement at FreeBSD.org\n2003/12/17"]
clsung [label="Cheng-Lung Sung\nclsung at FreeBSD.org\n2004/8/18"]
cperciva [label="Colin Percival\ncperciva at FreeBSD.org\n2006/01/31"]
@@ -239,6 +240,8 @@
philip -> koitsu
+rafan -> chinsan
+
sat -> beech
sem -> az
==== //depot/projects/wifi/sys/conf/files#54 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1216 2007/06/11 03:36:48 sam Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1217 2007/06/12 16:24:54 bms Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1802,6 +1802,7 @@
netinet/in_gif.c optional gif inet
netinet/ip_gre.c optional gre inet
netinet/ip_id.c optional inet
+netinet/in_mcast.c optional inet
netinet/in_pcb.c optional inet
netinet/in_proto.c optional inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
==== //depot/projects/wifi/sys/dev/if_ndis/if_ndis_usb.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.7 2006/09/07 06:00:03 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.8 2007/06/12 15:37:19 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,7 +130,7 @@
sc = (struct ndis_softc *)dummy;
if (uaa->device == NULL)
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
sc->ndis_dev = self;
@@ -140,9 +140,9 @@
windrv_create_pdo(drv, self);
if (ndis_attach(self) != 0)
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
- USB_ATTACH_SUCCESS_RETURN;
+ return 0;
}
static struct resource_list *
==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#54 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.52 2007/03/21 18:40:31 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.54 2007/06/11 10:56:06 thompsa Exp $");
/*-
* Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
==== //depot/projects/wifi/sys/dev/msk/if_mskreg.h#5 (text+ko) ====
@@ -93,7 +93,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/*$FreeBSD: src/sys/dev/msk/if_mskreg.h,v 1.5 2007/06/11 02:00:50 yongari Exp $*/
+/*$FreeBSD: src/sys/dev/msk/if_mskreg.h,v 1.6 2007/06/12 10:50:32 yongari Exp $*/
/*
* SysKonnect PCI vendor ID
@@ -2185,7 +2185,7 @@
#define MSK_STAT_RING_CNT ((1 + 3) * (MSK_TX_RING_CNT + MSK_RX_RING_CNT))
#define MSK_MAXTXSEGS 32
#define MSK_TSO_MAXSGSIZE 4096
-#define MSK_TSO_MAXSIZE 65535
+#define MSK_TSO_MAXSIZE (65535 + sizeof(struct ether_vlan_header))
#define MSK_MAXRXSEGS 32
/*
==== //depot/projects/wifi/sys/dev/nfe/if_nfereg.h#4 (text+ko) ====
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $FreeBSD: src/sys/dev/nfe/if_nfereg.h,v 1.9 2007/06/12 02:35:01 yongari Exp $
+ * $FreeBSD: src/sys/dev/nfe/if_nfereg.h,v 1.10 2007/06/12 10:51:47 yongari Exp $
*/
#define NFE_RX_RING_COUNT 256
@@ -51,7 +51,7 @@
#define NFE_MAX_SCATTER 32
#define NFE_TSO_MAXSGSIZE 4096
-#define NFE_TSO_MAXSIZE 65535
+#define NFE_TSO_MAXSIZE (65535 + sizeof(struct ether_vlan_header))
#define NFE_IRQ_STATUS 0x000
#define NFE_IRQ_MASK 0x004
==== //depot/projects/wifi/sys/dev/sound/usb/uaudio.c#17 (text+ko) ====
@@ -1,5 +1,5 @@
/* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */
-/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.32 2007/06/10 15:45:29 mjacob Exp $ */
+/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.33 2007/06/12 15:37:19 imp Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -552,14 +552,14 @@
if (cdesc == NULL) {
printf("%s: failed to get configuration descriptor\n",
device_get_nameunit(sc->sc_dev));
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
err = uaudio_identify(sc, cdesc);
if (err) {
printf("%s: audio descriptors make no sense, error=%d\n",
device_get_nameunit(sc->sc_dev), err);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
sc->sc_ac_ifaceh = uaa->iface;
@@ -586,7 +586,7 @@
if (sc->sc_alts[j].ifaceh == NULL) {
printf("%s: alt %d missing AS interface(s)\n",
device_get_nameunit(sc->sc_dev), j);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
}
@@ -620,7 +620,7 @@
sc->sc_dying = 0;
if (audio_attach_mi(sc->sc_dev)) {
printf("audio_attach_mi failed\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
#endif
@@ -630,8 +630,7 @@
OID_AUTO, "async", CTLFLAG_RW, &sc->async, 0,
"Asynchronous USB request");
#endif
-
- USB_ATTACH_SUCCESS_RETURN;
+ return 0;
}
#if defined(__NetBSD__) || defined(__OpenBSD__)
==== //depot/projects/wifi/sys/dev/usb/if_aue.c#14 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.108 2007/06/11 05:44:28 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.109 2007/06/12 15:37:17 imp Exp $");
/*
* ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver.
@@ -644,13 +644,13 @@
if (usbd_set_config_no(sc->aue_udev, AUE_CONFIG_NO, 0)) {
device_printf(self, "getting interface handle failed\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
err = usbd_device2interface_handle(uaa->device, AUE_IFACE_IDX, &iface);
if (err) {
device_printf(self, "getting interface handle failed\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
sc->aue_iface = iface;
@@ -666,7 +666,7 @@
ed = usbd_interface2endpoint_descriptor(iface, i);
if (ed == NULL) {
device_printf(self, "couldn't get ep %d\n", i);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
@@ -702,7 +702,7 @@
mtx_destroy(&sc->aue_mtx);
sx_destroy(&sc->aue_sx);
usb_ether_task_destroy(&sc->aue_taskqueue);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
ifp->if_softc = sc;
if_initname(ifp, "aue", sc->aue_unit);
@@ -736,7 +736,7 @@
mtx_destroy(&sc->aue_mtx);
sx_destroy(&sc->aue_sx);
usb_ether_task_destroy(&sc->aue_taskqueue);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
sc->aue_qdat.ifp = ifp;
@@ -751,7 +751,7 @@
sc->aue_link = 1;
AUE_SXUNLOCK(sc);
- USB_ATTACH_SUCCESS_RETURN;
+ return 0;
}
static int
==== //depot/projects/wifi/sys/dev/usb/if_axe.c#19 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.46 2007/06/10 07:24:32 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.47 2007/06/12 15:37:17 imp Exp $");
/*
* ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the
@@ -517,7 +517,7 @@
if (usbd_set_config_no(sc->axe_udev, AXE_CONFIG_NO, 1)) {
device_printf(sc->axe_dev, "getting interface handle failed\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
usb_init_task(&sc->axe_tick_task, axe_tick_task, sc);
@@ -525,7 +525,7 @@
if (usbd_device2interface_handle(uaa->device,
AXE_IFACE_IDX, &sc->axe_iface)) {
device_printf(sc->axe_dev, "getting interface handle failed\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
id = usbd_get_interface_descriptor(sc->axe_iface);
@@ -534,7 +534,7 @@
ed = usbd_interface2endpoint_descriptor(sc->axe_iface, i);
if (!ed) {
device_printf(sc->axe_dev, "couldn't get ep %d\n", i);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
@@ -586,7 +586,7 @@
AXE_SLEEPUNLOCK(sc);
sx_destroy(&sc->axe_sleeplock);
mtx_destroy(&sc->axe_mtx);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
ifp->if_softc = sc;
if_initname(ifp, "axe", device_get_unit(sc->axe_dev));
@@ -612,7 +612,7 @@
AXE_SLEEPUNLOCK(sc);
sx_destroy(&sc->axe_sleeplock);
mtx_destroy(&sc->axe_mtx);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
/*
@@ -628,7 +628,7 @@
AXE_UNLOCK(sc);
AXE_SLEEPUNLOCK(sc);
- USB_ATTACH_SUCCESS_RETURN;
+ return 0;
}
static int
==== //depot/projects/wifi/sys/dev/usb/if_cdce.c#9 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.18 2007/06/10 07:33:48 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.20 2007/06/12 16:52:07 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,7 +160,7 @@
UDESC_CS_INTERFACE, UDESCSUB_CDC_UNION);
if (ud == NULL) {
device_printf(sc->cdce_dev, "no union descriptor\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
data_ifcno = ud->bSlaveInterface[0];
@@ -179,7 +179,7 @@
if (sc->cdce_data_iface == NULL) {
device_printf(sc->cdce_dev, "no data interface\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
/*
@@ -208,7 +208,7 @@
if (usbd_set_interface(sc->cdce_data_iface, j)) {
device_printf(sc->cdce_dev,
"setting alternate interface failed\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
/* Find endpoints. */
id = usbd_get_interface_descriptor(sc->cdce_data_iface);
@@ -218,7 +218,7 @@
if (!ed) {
device_printf(sc->cdce_dev,
"could not read endpoint descriptor\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
@@ -242,11 +242,11 @@
if (sc->cdce_bulkin_no == -1) {
device_printf(sc->cdce_dev, "could not find data bulk in\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
if (sc->cdce_bulkout_no == -1 ) {
device_printf(sc->cdce_dev, "could not find data bulk out\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
mtx_init(&sc->cdce_mtx, device_get_nameunit(sc->cdce_dev), MTX_NETWORK_LOCK,
@@ -285,7 +285,7 @@
device_printf(sc->cdce_dev, "can not if_alloc()\n");
CDCE_UNLOCK(sc);
mtx_destroy(&sc->cdce_mtx);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
ifp->if_softc = sc;
if_initname(ifp, "cdce", device_get_unit(sc->cdce_dev));
@@ -312,9 +312,9 @@
CDCE_UNLOCK(sc);
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->cdce_udev,
- USBDEV(sc->cdce_dev));
+ sc->cdce_dev);
- USB_ATTACH_SUCCESS_RETURN;
+ return 0;
}
USB_DETACH(cdce)
@@ -335,7 +335,7 @@
mtx_destroy(&sc->cdce_mtx);
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->cdce_udev,
- USBDEV(sc->cdce_dev));
+ sc->cdce_dev);
return (0);
}
==== //depot/projects/wifi/sys/dev/usb/if_cue.c#13 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.66 2007/06/11 05:42:47 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.67 2007/06/12 15:37:18 imp Exp $");
/*
* CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate
@@ -443,7 +443,7 @@
if (usbd_set_config_no(sc->cue_udev, CUE_CONFIG_NO, 0)) {
device_printf(sc->cue_dev, "getting interface handle failed\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
id = usbd_get_interface_descriptor(uaa->iface);
@@ -453,7 +453,7 @@
ed = usbd_interface2endpoint_descriptor(uaa->iface, i);
if (!ed) {
device_printf(sc->cue_dev, "couldn't get ep %d\n", i);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
@@ -485,7 +485,7 @@
device_printf(sc->cue_dev, "can not if_alloc()\n");
CUE_UNLOCK(sc);
mtx_destroy(&sc->cue_mtx);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
ifp->if_softc = sc;
if_initname(ifp, "cue", device_get_unit(sc->cue_dev));
@@ -511,7 +511,7 @@
sc->cue_dying = 0;
CUE_UNLOCK(sc);
- USB_ATTACH_SUCCESS_RETURN;
+ return 0;
}
static int
==== //depot/projects/wifi/sys/dev/usb/if_kue.c#13 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.75 2007/06/11 05:50:47 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.76 2007/06/12 15:37:18 imp Exp $");
/*
* Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver.
@@ -421,7 +421,7 @@
ed = usbd_interface2endpoint_descriptor(uaa->iface, i);
if (!ed) {
device_printf(sc->kue_dev, "couldn't get ep %d\n", i);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
@@ -443,7 +443,7 @@
if (kue_load_fw(sc)) {
KUE_UNLOCK(sc);
mtx_destroy(&sc->kue_mtx);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
/* Reset the adapter. */
@@ -461,7 +461,7 @@
device_printf(sc->kue_dev, "can not if_alloc()\n");
KUE_UNLOCK(sc);
mtx_destroy(&sc->kue_mtx);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
ifp->if_softc = sc;
if_initname(ifp, "kue", device_get_unit(sc->kue_dev));
@@ -487,7 +487,7 @@
KUE_UNLOCK(sc);
- USB_ATTACH_SUCCESS_RETURN;
+ return 0;
}
static int
==== //depot/projects/wifi/sys/dev/usb/if_rue.c#13 (text+ko) ====
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.33 2007/06/11 06:01:05 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.34 2007/06/12 15:37:18 imp Exp $");
/*
* RealTek RTL8150 USB to fast ethernet controller driver.
@@ -679,7 +679,7 @@
sc->rue_dying = 0;
RUE_UNLOCK(sc);
- USB_ATTACH_SUCCESS_RETURN;
+ return 0;
error2:
if_free(ifp);
@@ -687,7 +687,7 @@
RUE_UNLOCK(sc);
mtx_destroy(&sc->rue_mtx);
error:
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
static int
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list