svn commit: r198060 - in user/eri/pf45/head: . bin/ls games/number
kerberos5/lib/libgssapi_krb5 kerberos5/lib/libgssapi_spnego
lib/libc/gen lib/libc/nls sbin/ifconfig sys/amd64/conf
sys/arm/conf sy...
Ermal Luçi
eri at FreeBSD.org
Tue Oct 13 22:20:06 UTC 2009
Author: eri
Date: Tue Oct 13 22:20:05 2009
New Revision: 198060
URL: http://svn.freebsd.org/changeset/base/198060
Log:
IFH
Modified:
user/eri/pf45/head/ (props changed)
user/eri/pf45/head/Makefile.inc1
user/eri/pf45/head/ObsoleteFiles.inc
user/eri/pf45/head/bin/ls/ls.c
user/eri/pf45/head/games/number/Makefile
user/eri/pf45/head/games/number/number.c
user/eri/pf45/head/kerberos5/lib/libgssapi_krb5/Makefile
user/eri/pf45/head/kerberos5/lib/libgssapi_spnego/Makefile
user/eri/pf45/head/lib/libc/gen/getcwd.c
user/eri/pf45/head/lib/libc/nls/C.msg
user/eri/pf45/head/sbin/ifconfig/af_nd6.c
user/eri/pf45/head/sbin/ifconfig/ifieee80211.c
user/eri/pf45/head/sys/amd64/conf/GENERIC
user/eri/pf45/head/sys/arm/conf/HL200
user/eri/pf45/head/sys/arm/conf/KB920X
user/eri/pf45/head/sys/dev/bge/if_bge.c
user/eri/pf45/head/sys/dev/ppbus/lpt.c
user/eri/pf45/head/sys/dev/usb/input/ukbd.c
user/eri/pf45/head/sys/i386/conf/GENERIC
user/eri/pf45/head/sys/kern/kern_sig.c
user/eri/pf45/head/sys/modules/ubser/Makefile
user/eri/pf45/head/sys/net80211/ieee80211_hwmp.c
user/eri/pf45/head/sys/net80211/ieee80211_mesh.c
user/eri/pf45/head/sys/net80211/ieee80211_mesh.h
user/eri/pf45/head/sys/netinet/ip_icmp.c
user/eri/pf45/head/sys/netinet6/in6_ifattach.c
user/eri/pf45/head/sys/nfsclient/nfs_kdtrace.c
user/eri/pf45/head/sys/pc98/conf/GENERIC
user/eri/pf45/head/sys/sparc64/conf/GENERIC
user/eri/pf45/head/usr.sbin/mfiutil/mfiutil.8 (props changed)
user/eri/pf45/head/usr.sbin/ntp/doc/ntpd.8
Modified: user/eri/pf45/head/Makefile.inc1
==============================================================================
--- user/eri/pf45/head/Makefile.inc1 Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/Makefile.inc1 Tue Oct 13 22:20:05 2009 (r198060)
@@ -1122,7 +1122,7 @@ lib/libradius__L secure/lib/libssl__L: s
_secure_lib_libssh= secure/lib/libssh
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
.if ${MK_KERBEROS} != "no"
-kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \
+kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \
lib/libcrypt__L
Modified: user/eri/pf45/head/ObsoleteFiles.inc
==============================================================================
--- user/eri/pf45/head/ObsoleteFiles.inc Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/ObsoleteFiles.inc Tue Oct 13 22:20:05 2009 (r198060)
@@ -503,6 +503,8 @@ OLD_FILES+=usr/include/dev/usb/usb_quirk
OLD_FILES+=usr/include/dev/usb/usbcdc.h
OLD_FILES+=usr/include/dev/usb/usbdivar.h
OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h
+OLD_FILES+=usr/sbin/usbdevs
+OLD_FILES+=usr/share/man/man8/usbdevs.8.gz
# 20090203: removal of pccard header files
OLD_FILES+=usr/include/pccard/cardinfo.h
OLD_FILES+=usr/include/pccard/cis.h
Modified: user/eri/pf45/head/bin/ls/ls.c
==============================================================================
--- user/eri/pf45/head/bin/ls/ls.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/bin/ls/ls.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -399,7 +399,7 @@ main(int argc, char *argv[])
* If not -F, -d or -l options, follow any symbolic links listed on
* the command line.
*/
- if (!f_longform && !f_listdir && !f_type)
+ if (!f_longform && !f_listdir && (!f_type || f_slash))
fts_options |= FTS_COMFOLLOW;
/*
Modified: user/eri/pf45/head/games/number/Makefile
==============================================================================
--- user/eri/pf45/head/games/number/Makefile Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/games/number/Makefile Tue Oct 13 22:20:05 2009 (r198060)
@@ -4,4 +4,6 @@
PROG= number
MAN= number.6
+WARNS?= 6
+
.include <bsd.prog.mk>
Modified: user/eri/pf45/head/games/number/number.c
==============================================================================
--- user/eri/pf45/head/games/number/number.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/games/number/number.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -88,9 +88,7 @@ void usage(void);
int lflag;
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
int ch, first;
char line[256];
@@ -275,7 +273,7 @@ void
pfract(len)
int len;
{
- static char *pref[] = { "", "ten-", "hundred-" };
+ static char const * const pref[] = { "", "ten-", "hundred-" };
switch(len) {
case 1:
Modified: user/eri/pf45/head/kerberos5/lib/libgssapi_krb5/Makefile
==============================================================================
--- user/eri/pf45/head/kerberos5/lib/libgssapi_krb5/Makefile Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/kerberos5/lib/libgssapi_krb5/Makefile Tue Oct 13 22:20:05 2009 (r198060)
@@ -2,8 +2,8 @@
LIB= gssapi_krb5
LDFLAGS= -Wl,-Bsymbolic
-LDADD= -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt
-DPADD= ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \
+LDADD= -lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt
+DPADD= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \
${LIBCOM_ERR} ${LIBCRYPT}
INCS= ${KRB5DIR}/lib/gssapi/gssapi/gssapi_krb5.h
Modified: user/eri/pf45/head/kerberos5/lib/libgssapi_spnego/Makefile
==============================================================================
--- user/eri/pf45/head/kerberos5/lib/libgssapi_spnego/Makefile Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/kerberos5/lib/libgssapi_spnego/Makefile Tue Oct 13 22:20:05 2009 (r198060)
@@ -2,8 +2,8 @@
LIB= gssapi_spnego
LDFLAGS= -Wl,-Bsymbolic
-LDADD= -lasn1
-DPADD= ${LIBASN1}
+LDADD= -lgssapi -lasn1
+DPADD= ${LIBGSSAPI} ${LIBASN1}
SRCS= accept_sec_context.c \
compat.c \
Modified: user/eri/pf45/head/lib/libc/gen/getcwd.c
==============================================================================
--- user/eri/pf45/head/lib/libc/gen/getcwd.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/lib/libc/gen/getcwd.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -62,13 +62,14 @@ getcwd(pt, size)
dev_t dev;
ino_t ino;
int first;
- char *bpt, *bup;
+ char *bpt;
struct stat s;
dev_t root_dev;
ino_t root_ino;
- size_t ptsize, upsize;
+ size_t ptsize;
int save_errno;
- char *ept, *eup, *up, c;
+ char *ept, c;
+ int fd;
/*
* If no buffer specified by the user, allocate one as necessary.
@@ -106,18 +107,6 @@ getcwd(pt, size)
bpt = ept - 1;
*bpt = '\0';
- /*
- * Allocate 1024 bytes for the string of "../"'s.
- * Should always be enough. If it's not, allocate
- * as necessary. Special case the first stat, it's ".", not "..".
- */
- if ((up = malloc(upsize = 1024)) == NULL)
- goto err;
- eup = up + upsize;
- bup = up;
- up[0] = '.';
- up[1] = '\0';
-
/* Save root values, so know when to stop. */
if (stat("/", &s))
goto err;
@@ -128,7 +117,7 @@ getcwd(pt, size)
for (first = 1;; first = 0) {
/* Stat the current level. */
- if (lstat(up, &s))
+ if (dir != NULL ? _fstat(dirfd(dir), &s) : lstat(".", &s))
goto err;
/* Save current node values. */
@@ -144,32 +133,22 @@ getcwd(pt, size)
* been that way and stuff would probably break.
*/
bcopy(bpt, pt, ept - bpt);
- free(up);
+ if (dir)
+ (void) closedir(dir);
return (pt);
}
- /*
- * Build pointer to the parent directory, allocating memory
- * as necessary. Max length is 3 for "../", the largest
- * possible component name, plus a trailing NUL.
- */
- while (bup + 3 + MAXNAMLEN + 1 >= eup) {
- if ((up = reallocf(up, upsize *= 2)) == NULL)
- goto err;
- bup = up;
- eup = up + upsize;
- }
- *bup++ = '.';
- *bup++ = '.';
- *bup = '\0';
-
/* Open and stat parent directory. */
- if (!(dir = opendir(up)) || _fstat(dirfd(dir), &s))
+ fd = _openat(dir != NULL ? dirfd(dir) : AT_FDCWD,
+ "..", O_RDONLY);
+ if (fd == -1)
goto err;
-
- /* Add trailing slash for next directory. */
- *bup++ = '/';
- *bup = '\0';
+ if (dir)
+ (void) closedir(dir);
+ if (!(dir = fdopendir(fd)) || _fstat(dirfd(dir), &s)) {
+ _close(fd);
+ goto err;
+ }
/*
* If it's a mount point, have to stat each element because
@@ -190,10 +169,10 @@ getcwd(pt, size)
goto notfound;
if (ISDOT(dp))
continue;
- bcopy(dp->d_name, bup, dp->d_namlen + 1);
/* Save the first error for later. */
- if (lstat(up, &s)) {
+ if (fstatat(dirfd(dir), dp->d_name, &s,
+ AT_SYMLINK_NOFOLLOW)) {
if (!save_errno)
save_errno = errno;
errno = 0;
@@ -227,11 +206,6 @@ getcwd(pt, size)
*--bpt = '/';
bpt -= dp->d_namlen;
bcopy(dp->d_name, bpt, dp->d_namlen);
- (void) closedir(dir);
- dir = NULL;
-
- /* Truncate any file name. */
- *bup = '\0';
}
notfound:
@@ -250,7 +224,6 @@ err:
free(pt);
if (dir)
(void) closedir(dir);
- free(up);
errno = save_errno;
return (NULL);
Modified: user/eri/pf45/head/lib/libc/nls/C.msg
==============================================================================
--- user/eri/pf45/head/lib/libc/nls/C.msg Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/lib/libc/nls/C.msg Tue Oct 13 22:20:05 2009 (r198060)
@@ -181,6 +181,16 @@ $ ENOATTR
87 Attribute not found
$ EDOOFUS
88 Programming error
+$ EBADMSG
+89 Bad message
+$ EMULTIHOP
+90 Multihop attempted
+$ ENOLINK
+91 Link has been severed
+$ EPROTO
+92 Protocol error
+$ ENOTCAPABLE
+93 Capabilities insufficient
$
$ strsignal() support catalog
$
Modified: user/eri/pf45/head/sbin/ifconfig/af_nd6.c
==============================================================================
--- user/eri/pf45/head/sbin/ifconfig/af_nd6.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sbin/ifconfig/af_nd6.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -56,17 +56,9 @@ static const char rcsid[] =
#include "ifconfig.h"
#define MAX_SYSCTL_TRY 5
-
-static struct nd6_opt_list {
- const char *label;
- u_int mask;
-} nd6_opts[] = {
- { "IFDISABLED", ND6_IFF_IFDISABLED, },
- { "PERFORMNUD", ND6_IFF_PERFORMNUD, },
- { "ACCEPT_RTADV", ND6_IFF_ACCEPT_RTADV, },
- { "PREFER_SOURCE", ND6_IFF_PREFER_SOURCE, },
- { "AUTO_LINKLOCAL", ND6_IFF_AUTO_LINKLOCAL, },
-};
+#define ND6BITS "\020\001PERFORMNUD\002ACCEPT_RTADV\003PREFER_SOURCE" \
+ "\004IFDISABLED\005DONT_SET_IFROUTE\006AUTO_LINKLOCAL" \
+ "\020DEFAULTIF"
static int isnd6defif(int);
void setnd6flags(const char *, int, int, const struct afswtch *);
@@ -153,9 +145,8 @@ nd6_status(int s)
char *buf, *next;
int mib[6], ntry;
int s6;
- int i, error;
+ int error;
int isinet6, isdefif;
- int nopts;
/* Check if the interface has at least one IPv6 address. */
mib[0] = CTL_NET;
@@ -220,22 +211,9 @@ nd6_status(int s)
close(s6);
if (nd.ndi.flags == 0 && !isdefif)
return;
-
- nopts = 0;
- printf("\tnd6 options=%d<", nd.ndi.flags);
- for (i=0; i < sizeof(nd6_opts)/sizeof(nd6_opts[0]); i++) {
- if (nd.ndi.flags & nd6_opts[i].mask) {
- if (nopts++)
- printf(",");
- printf("%s", nd6_opts[i].label);
- }
- }
- if (isdefif) {
- if (nopts)
- printf(",");
- printf("DEFAULTIF");
- }
- printf(">\n");
+ printb("\tnd6 options",
+ (unsigned int)(nd.ndi.flags | (isdefif << 15)), ND6BITS);
+ putchar('\n');
}
static struct afswtch af_nd6 = {
Modified: user/eri/pf45/head/sbin/ifconfig/ifieee80211.c
==============================================================================
--- user/eri/pf45/head/sbin/ifconfig/ifieee80211.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sbin/ifconfig/ifieee80211.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -2624,25 +2624,31 @@ do { \
if (verbose) {
const struct ieee80211_meshconf_ie *mconf =
(const struct ieee80211_meshconf_ie *)ie;
- const uint8_t null[4] = IEEE80211_MESHCONF_NULL;
- const uint8_t hwmp[4] = IEEE80211_MESHCONF_HWMP;
- const uint8_t airtime[4] = IEEE80211_MESHCONF_AIRTIME;
- const uint8_t ccsig[4] = IEEE80211_MESHCONF_CCSIG;
- const uint8_t sae[4] = IEEE80211_MESHCONF_SAE;
- const uint8_t neighoff[4] = IEEE80211_MESHCONF_SAE;
- printf("<v%d PATH:", mconf->conf_ver);
- MATCHOUI(mconf->conf_pselid, hwmp, "HWMP");
+ printf("<PATH:");
+ if (mconf->conf_pselid == IEEE80211_MESHCONF_PATH_HWMP)
+ printf("HWMP");
+ else
+ printf("UNKNOWN");
printf(" LINK:");
- MATCHOUI(mconf->conf_pmetid, airtime, "AIRTIME");
+ if (mconf->conf_pmetid == IEEE80211_MESHCONF_METRIC_AIRTIME)
+ printf("AIRTIME");
+ else
+ printf("UNKNOWN");
printf(" CONGESTION:");
- MATCHOUI(mconf->conf_ccid, ccsig, "SIG");
- MATCHOUI(mconf->conf_ccid, null, "NULL");
+ if (mconf->conf_ccid == IEEE80211_MESHCONF_CC_DISABLED)
+ printf("DISABLED");
+ else
+ printf("UNKNOWN");
printf(" SYNC:");
- MATCHOUI(mconf->conf_syncid, neighoff, "NEIGHOFF");
- MATCHOUI(mconf->conf_syncid, null, "NULL");
+ if (mconf->conf_syncid == IEEE80211_MESHCONF_SYNC_NEIGHOFF)
+ printf("NEIGHOFF");
+ else
+ printf("UNKNOWN");
printf(" AUTH:");
- MATCHOUI(mconf->conf_authid, sae, "SAE");
- MATCHOUI(mconf->conf_authid, null, "NULL");
+ if (mconf->conf_authid == IEEE80211_MESHCONF_AUTH_DISABLED)
+ printf("DISABLED");
+ else
+ printf("UNKNOWN");
printf(" FORM:0x%x CAPS:0x%x>", mconf->conf_form,
mconf->conf_cap);
}
Modified: user/eri/pf45/head/sys/amd64/conf/GENERIC
==============================================================================
--- user/eri/pf45/head/sys/amd64/conf/GENERIC Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/amd64/conf/GENERIC Tue Oct 13 22:20:05 2009 (r198060)
@@ -297,10 +297,6 @@ device ukbd # Keyboard
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
-device rum # Ralink Technology RT2501USB wireless NICs
-device uath # Atheros AR5523 wireless NICs
-device ural # Ralink Technology RT2500USB wireless NICs
-device zyd # ZyDAS zb1211/zb1211b wireless NICs
device urio # Diamond Rio 500 MP3 player
# USB Serial devices
device uark # Technologies ARK3116 based serial adapters
@@ -319,6 +315,11 @@ device cue # CATC USB Ethernet
device kue # Kawasaki LSI USB Ethernet
device rue # RealTek RTL8150 USB Ethernet
device udav # Davicom DM9601E USB
+# USB Wireless
+device rum # Ralink Technology RT2501USB wireless NICs
+device uath # Atheros AR5523 wireless NICs
+device ural # Ralink Technology RT2500USB wireless NICs
+device zyd # ZyDAS zb1211/zb1211b wireless NICs
# FireWire support
device firewire # FireWire bus code
Modified: user/eri/pf45/head/sys/arm/conf/HL200
==============================================================================
--- user/eri/pf45/head/sys/arm/conf/HL200 Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/arm/conf/HL200 Tue Oct 13 22:20:05 2009 (r198060)
@@ -100,9 +100,17 @@ device usb # USB Bus (required)
device uhid # "Human Interface Devices"
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
-device ural # Ralink Technology RT2500USB wireless NICs
-device rum # Ralink Technology RT2501USB wireless NICs
device urio # Diamond Rio 500 MP3 player
+# USB Serial devices
+device uark # Technologies ARK3116 based serial adapters
+device ubsa # Belkin F5U103 and compatible serial adapters
+#device ubser # not yet converted.
+device uftdi # For FTDI usb serial adapters
+device uipaq # Some WinCE based devices
+device uplcom # Prolific PL-2303 serial adapters
+device uslcom # SI Labs CP2101/CP2102 serial adapters
+device uvisor # Visor and Palm devices
+device uvscom # USB serial support for DDI pocket's PHS
# USB Ethernet, requires miibus
device miibus
device aue # ADMtek USB Ethernet
@@ -111,16 +119,12 @@ device cdce # Generic USB over Etherne
device cue # CATC USB Ethernet
device kue # Kawasaki LSI USB Ethernet
device rue # RealTek RTL8150 USB Ethernet
-device udav
-# usb serial
-device uark
-device ubsa
-#device ubser # not yet converted.
-device uftdi
-device uipaq
-device uplcom
-device uvisor
-device uvscom
+device udav # Davicom DM9601E USB
+# USB Wireless
+device rum # Ralink Technology RT2501USB wireless NICs
+device uath # Atheros AR5523 wireless NICs
+device ural # Ralink Technology RT2500USB wireless NICs
+device zyd # ZyDAS zb1211/zb1211b wireless NICs
# SCSI peripherals
device scbus # SCSI bus (required for SCSI)
device da # Direct Access (disks)
Modified: user/eri/pf45/head/sys/arm/conf/KB920X
==============================================================================
--- user/eri/pf45/head/sys/arm/conf/KB920X Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/arm/conf/KB920X Tue Oct 13 22:20:05 2009 (r198060)
@@ -101,9 +101,16 @@ device usb # USB Bus (required)
device uhid # "Human Interface Devices"
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
-device ural # Ralink Technology RT2500USB wireless NICs
-device rum # Ralink Technology RT2501USB wireless NICs
device urio # Diamond Rio 500 MP3 player
+# USB Serial devices
+device uark # Technologies ARK3116 based serial adapters
+device ubsa # Belkin F5U103 and compatible serial adapters
+device uftdi # For FTDI usb serial adapters
+device uipaq # Some WinCE based devices
+device uplcom # Prolific PL-2303 serial adapters
+device uslcom # SI Labs CP2101/CP2102 serial adapters
+device uvisor # Visor and Palm devices
+device uvscom # USB serial support for DDI pocket's PHS
# USB Ethernet, requires miibus
device miibus
device aue # ADMtek USB Ethernet
@@ -112,15 +119,12 @@ device cdce # Generic USB over Etherne
device cue # CATC USB Ethernet
device kue # Kawasaki LSI USB Ethernet
device rue # RealTek RTL8150 USB Ethernet
-device udav
-# usb serial
-device uark
-device ubsa
-device uftdi
-device uipaq
-device uplcom
-device uvisor
-device uvscom
+device udav # Davicom DM9601E USB
+# USB Wireless
+device rum # Ralink Technology RT2501USB wireless NICs
+device uath # Atheros AR5523 wireless NICs
+device ural # Ralink Technology RT2500USB wireless NICs
+device zyd # ZyDAS zb1211/zb1211b wireless NICs
# SCSI peripherals
device scbus # SCSI bus (required for SCSI)
device da # Direct Access (disks)
Modified: user/eri/pf45/head/sys/dev/bge/if_bge.c
==============================================================================
--- user/eri/pf45/head/sys/dev/bge/if_bge.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/dev/bge/if_bge.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -4270,6 +4270,16 @@ bge_stop(struct bge_softc *sc)
callout_stop(&sc->bge_stat_ch);
+ /* Disable host interrupts. */
+ BGE_SETBIT(sc, BGE_PCI_MISC_CTL, BGE_PCIMISCCTL_MASK_PCI_INTR);
+ bge_writembx(sc, BGE_MBX_IRQ0_LO, 1);
+
+ /*
+ * Tell firmware we're shutting down.
+ */
+ bge_stop_fw(sc);
+ bge_sig_pre_reset(sc, BGE_RESET_STOP);
+
/*
* Disable all of the receiver blocks.
*/
@@ -4309,16 +4319,6 @@ bge_stop(struct bge_softc *sc)
BGE_CLRBIT(sc, BGE_MARB_MODE, BGE_MARBMODE_ENABLE);
}
- /* Disable host interrupts. */
- BGE_SETBIT(sc, BGE_PCI_MISC_CTL, BGE_PCIMISCCTL_MASK_PCI_INTR);
- bge_writembx(sc, BGE_MBX_IRQ0_LO, 1);
-
- /*
- * Tell firmware we're shutting down.
- */
-
- bge_stop_fw(sc);
- bge_sig_pre_reset(sc, BGE_RESET_STOP);
bge_reset(sc);
bge_sig_legacy(sc, BGE_RESET_STOP);
bge_sig_post_reset(sc, BGE_RESET_STOP);
Modified: user/eri/pf45/head/sys/dev/ppbus/lpt.c
==============================================================================
--- user/eri/pf45/head/sys/dev/ppbus/lpt.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/dev/ppbus/lpt.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -624,7 +624,7 @@ lptclose(struct cdev *dev, int flags, in
while ((ppb_rstr(ppbus) &
(LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR)) !=
(LPS_SEL|LPS_NBSY|LPS_NERR) || sc->sc_xfercnt)
- /* wait 1/4 second, give up if we get a signal */
+ /* wait 1 second, give up if we get a signal */
if (ppb_sleep(ppbus, lptdev, LPPRI | PCATCH, "lpclose",
hz) != EWOULDBLOCK)
break;
Modified: user/eri/pf45/head/sys/dev/usb/input/ukbd.c
==============================================================================
--- user/eri/pf45/head/sys/dev/usb/input/ukbd.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/dev/usb/input/ukbd.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -247,8 +247,8 @@ static const uint8_t ukbd_trtab[256] = {
NN, NN, NN, NN, NN, NN, NN, NN, /* 68 - 6F */
NN, NN, NN, NN, 115, 108, 111, 113, /* 70 - 77 */
109, 110, 112, 118, 114, 116, 117, 119, /* 78 - 7F */
- 121, 120, NN, NN, NN, NN, NN, 115, /* 80 - 87 */
- 112, 125, 121, 123, NN, NN, NN, NN, /* 88 - 8F */
+ 121, 120, NN, NN, NN, NN, NN, 123, /* 80 - 87 */
+ 124, 125, 126, 127, 128, NN, NN, NN, /* 88 - 8F */
NN, NN, NN, NN, NN, NN, NN, NN, /* 90 - 97 */
NN, NN, NN, NN, NN, NN, NN, NN, /* 98 - 9F */
NN, NN, NN, NN, NN, NN, NN, NN, /* A0 - A7 */
@@ -1636,20 +1636,59 @@ static int
ukbd_key2scan(struct ukbd_softc *sc, int code, int shift, int up)
{
static const int scan[] = {
- 0x1c, 0x1d, 0x35,
- 0x37 | SCAN_PREFIX_SHIFT, /* PrintScreen */
- 0x38, 0x47, 0x48, 0x49, 0x4b, 0x4d, 0x4f,
- 0x50, 0x51, 0x52, 0x53,
- 0x46, /* XXX Pause/Break */
- 0x5b, 0x5c, 0x5d,
+ /* 89 */
+ 0x11c, /* Enter */
+ /* 90-99 */
+ 0x11d, /* Ctrl-R */
+ 0x135, /* Divide */
+ 0x137 | SCAN_PREFIX_SHIFT, /* PrintScreen */
+ 0x138, /* Alt-R */
+ 0x147, /* Home */
+ 0x148, /* Up */
+ 0x149, /* PageUp */
+ 0x14b, /* Left */
+ 0x14d, /* Right */
+ 0x14f, /* End */
+ /* 100-109 */
+ 0x150, /* Down */
+ 0x151, /* PageDown */
+ 0x152, /* Insert */
+ 0x153, /* Delete */
+ 0x146, /* XXX Pause/Break */
+ 0x15b, /* Win_L(Super_L) */
+ 0x15c, /* Win_R(Super_R) */
+ 0x15d, /* Application(Menu) */
+
/* SUN TYPE 6 USB KEYBOARD */
- 0x68, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63,
- 0x64, 0x65, 0x66, 0x67, 0x25, 0x1f, 0x1e,
- 0x20,
+ 0x168, /* Sun Type 6 Help */
+ 0x15e, /* Sun Type 6 Stop */
+ /* 110 - 119 */
+ 0x15f, /* Sun Type 6 Again */
+ 0x160, /* Sun Type 6 Props */
+ 0x161, /* Sun Type 6 Undo */
+ 0x162, /* Sun Type 6 Front */
+ 0x163, /* Sun Type 6 Copy */
+ 0x164, /* Sun Type 6 Open */
+ 0x165, /* Sun Type 6 Paste */
+ 0x166, /* Sun Type 6 Find */
+ 0x167, /* Sun Type 6 Cut */
+ 0x125, /* Sun Type 6 Mute */
+ /* 120 - 128 */
+ 0x11f, /* Sun Type 6 VolumeDown */
+ 0x11e, /* Sun Type 6 VolumeUp */
+ 0x120, /* Sun Type 6 PowerDown */
+
+ /* Japanese 106/109 keyboard */
+ 0x73, /* Keyboard Intl' 1 (backslash / underscore) */
+ 0x70, /* Keyboard Intl' 2 (Katakana / Hiragana) */
+ 0x7d, /* Keyboard Intl' 3 (Yen sign) (Not using in jp106/109) */
+ 0x79, /* Keyboard Intl' 4 (Henkan) */
+ 0x7b, /* Keyboard Intl' 5 (Muhenkan) */
+ 0x5c, /* Keyboard Intl' 6 (Keypad ,) (For PC-9821 layout) */
};
if ((code >= 89) && (code < (89 + (sizeof(scan) / sizeof(scan[0]))))) {
- code = scan[code - 89] | SCAN_PREFIX_E0;
+ code = scan[code - 89];
}
/* Pause/Break */
if ((code == 104) && (!(shift & (MOD_CONTROL_L | MOD_CONTROL_R)))) {
Modified: user/eri/pf45/head/sys/i386/conf/GENERIC
==============================================================================
--- user/eri/pf45/head/sys/i386/conf/GENERIC Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/i386/conf/GENERIC Tue Oct 13 22:20:05 2009 (r198060)
@@ -310,10 +310,6 @@ device ukbd # Keyboard
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
-device rum # Ralink Technology RT2501USB wireless NICs
-device ural # Ralink Technology RT2500USB wireless NICs
-device uath # Atheros AR5523 wireless NICs
-device zyd # ZyDAS zb1211/zb1211b wireless NICs
device urio # Diamond Rio 500 MP3 player
# USB Serial devices
device u3g # USB-based 3G modems (Option, Huawei, Sierra)
@@ -333,6 +329,11 @@ device cue # CATC USB Ethernet
device kue # Kawasaki LSI USB Ethernet
device rue # RealTek RTL8150 USB Ethernet
device udav # Davicom DM9601E USB
+# USB Wireless
+device rum # Ralink Technology RT2501USB wireless NICs
+device uath # Atheros AR5523 wireless NICs
+device ural # Ralink Technology RT2500USB wireless NICs
+device zyd # ZyDAS zb1211/zb1211b wireless NICs
# FireWire support
device firewire # FireWire bus code
Modified: user/eri/pf45/head/sys/kern/kern_sig.c
==============================================================================
--- user/eri/pf45/head/sys/kern/kern_sig.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/kern/kern_sig.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -162,7 +162,7 @@ SYSINIT(signal, SI_SUB_P1003_1B, SI_ORDE
int sugid_coredump;
SYSCTL_INT(_kern, OID_AUTO, sugid_coredump, CTLFLAG_RW,
- &sugid_coredump, 0, "Enable coredumping set user/group ID processes");
+ &sugid_coredump, 0, "Allow setuid and setgid processes to dump core");
static int do_coredump = 1;
SYSCTL_INT(_kern, OID_AUTO, coredump, CTLFLAG_RW,
@@ -1014,7 +1014,7 @@ kern_sigprocmask(struct thread *td, int
}
/*
- * The new_block set contains signals that were not previosly
+ * The new_block set contains signals that were not previously
* blocked, but are blocked now.
*
* In case we block any signal that was not previously blocked
Modified: user/eri/pf45/head/sys/modules/ubser/Makefile
==============================================================================
--- user/eri/pf45/head/sys/modules/ubser/Makefile Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/modules/ubser/Makefile Tue Oct 13 22:20:05 2009 (r198060)
@@ -1,9 +1,9 @@
# $FreeBSD$
S= ${.CURDIR}/../..
-.PATH: $S/dev/usb
+.PATH: $S/dev/usb/serial
KMOD= ubser
-SRCS= ubser.c ubser.h opt_usb.h device_if.h bus_if.h usbdevs.h
+SRCS= ubser.c opt_usb.h device_if.h bus_if.h usbdevs.h
.include <bsd.kmod.mk>
Modified: user/eri/pf45/head/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- user/eri/pf45/head/sys/net80211/ieee80211_hwmp.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/net80211/ieee80211_hwmp.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -192,7 +192,7 @@ static ieee80211_recv_action_func hwmp_r
static struct ieee80211_mesh_proto_path mesh_proto_hwmp = {
.mpp_descr = "HWMP",
- .mpp_ie = IEEE80211_MESHCONF_HWMP,
+ .mpp_ie = IEEE80211_MESHCONF_PATH_HWMP,
.mpp_discover = hwmp_discover,
.mpp_peerdown = hwmp_peerdown,
.mpp_vattach = hwmp_vattach,
Modified: user/eri/pf45/head/sys/net80211/ieee80211_mesh.c
==============================================================================
--- user/eri/pf45/head/sys/net80211/ieee80211_mesh.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/net80211/ieee80211_mesh.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -132,7 +132,7 @@ static ieee80211_send_action_func mesh_s
static const struct ieee80211_mesh_proto_metric mesh_metric_airtime = {
.mpm_descr = "AIRTIME",
- .mpm_ie = IEEE80211_MESHCONF_AIRTIME,
+ .mpm_ie = IEEE80211_MESHCONF_METRIC_AIRTIME,
.mpm_metric = mesh_airtime_calc,
};
@@ -344,18 +344,18 @@ int
ieee80211_mesh_register_proto_path(const struct ieee80211_mesh_proto_path *mpp)
{
int i, firstempty = -1;
- static const uint8_t emptyie[4] = { 0, 0, 0, 0 };
for (i = 0; i < N(mesh_proto_paths); i++) {
- if (memcmp(mpp->mpp_ie, mesh_proto_paths[i].mpp_ie, 4) == 0)
+ if (strncmp(mpp->mpp_descr, mesh_proto_paths[i].mpp_descr,
+ IEEE80211_MESH_PROTO_DSZ) == 0)
return EEXIST;
- if (memcmp(mesh_proto_paths[i].mpp_ie, emptyie, 4) == 0 &&
- firstempty == -1)
+ if (!mesh_proto_paths[i].mpp_active && firstempty == -1)
firstempty = i;
}
if (firstempty < 0)
return ENOSPC;
memcpy(&mesh_proto_paths[firstempty], mpp, sizeof(*mpp));
+ mesh_proto_paths[firstempty].mpp_active = 1;
return 0;
}
@@ -364,18 +364,18 @@ ieee80211_mesh_register_proto_metric(con
ieee80211_mesh_proto_metric *mpm)
{
int i, firstempty = -1;
- static const uint8_t emptyie[4] = { 0, 0, 0, 0 };
for (i = 0; i < N(mesh_proto_metrics); i++) {
- if (memcmp(mpm->mpm_ie, mesh_proto_metrics[i].mpm_ie, 4) == 0)
+ if (strncmp(mpm->mpm_descr, mesh_proto_metrics[i].mpm_descr,
+ IEEE80211_MESH_PROTO_DSZ) == 0)
return EEXIST;
- if (memcmp(mesh_proto_metrics[i].mpm_ie, emptyie, 4) == 0 &&
- firstempty == -1)
+ if (!mesh_proto_metrics[i].mpm_active && firstempty == -1)
firstempty = i;
}
if (firstempty < 0)
return ENOSPC;
memcpy(&mesh_proto_metrics[firstempty], mpm, sizeof(*mpm));
+ mesh_proto_metrics[firstempty].mpm_active = 1;
return 0;
}
@@ -2282,51 +2282,40 @@ mesh_verify_meshid(struct ieee80211vap *
static int
mesh_verify_meshconf(struct ieee80211vap *vap, const uint8_t *ie)
{
- static const uint8_t null[4] = IEEE80211_MESHCONF_NULL;
const struct ieee80211_meshconf_ie *meshconf =
(const struct ieee80211_meshconf_ie *) ie;
const struct ieee80211_mesh_state *ms = vap->iv_mesh;
if (meshconf == NULL)
return 1;
- if (meshconf->conf_ver != IEEE80211_MESHCONF_VERSION) {
+ if (meshconf->conf_pselid != ms->ms_ppath->mpp_ie) {
IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
- "wrong mesh conf version: %d\n", meshconf->conf_ver);
+ "unknown path selection algorithm: 0x%x\n",
+ meshconf->conf_pselid);
return 1;
}
- if (memcmp(meshconf->conf_pselid, ms->ms_ppath->mpp_ie, 4) != 0) {
+ if (meshconf->conf_pmetid != ms->ms_pmetric->mpm_ie) {
IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
- "unknown path selection algorithm: 0x%x%x%x%x\n",
- meshconf->conf_pselid[0], meshconf->conf_pselid[1],
- meshconf->conf_pselid[2], meshconf->conf_pselid[3]);
+ "unknown path metric algorithm: 0x%x\n",
+ meshconf->conf_pmetid);
return 1;
}
- if (memcmp(meshconf->conf_pmetid, ms->ms_pmetric->mpm_ie, 4) != 0) {
+ if (meshconf->conf_ccid != 0) {
IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
- "unknown path metric algorithm: 0x%x%x%x%x\n",
- meshconf->conf_pmetid[0], meshconf->conf_pmetid[1],
- meshconf->conf_pmetid[2], meshconf->conf_pmetid[3]);
+ "unknown congestion control algorithm: 0x%x\n",
+ meshconf->conf_ccid);
return 1;
}
- if (memcmp(meshconf->conf_ccid, null, 4) != 0) {
+ if (meshconf->conf_syncid != IEEE80211_MESHCONF_SYNC_NEIGHOFF) {
IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
- "unknown congestion sig algorithm: 0x%x%x%x%x\n",
- meshconf->conf_ccid[0], meshconf->conf_ccid[1],
- meshconf->conf_ccid[2], meshconf->conf_ccid[3]);
+ "unknown sync algorithm: 0x%x\n",
+ meshconf->conf_syncid);
return 1;
}
- if (memcmp(meshconf->conf_syncid, null, 4) != 0) {
+ if (meshconf->conf_authid != 0) {
IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
- "unknown sync algorithm: 0x%x%x%x%x\n",
- meshconf->conf_syncid[0], meshconf->conf_syncid[1],
- meshconf->conf_syncid[2], meshconf->conf_syncid[3]);
- return 1;
- }
- if (memcmp(meshconf->conf_authid, null, 4) != 0) {
- IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
- "unknown auth auth algorithm: 0x%x%x%x%x\n",
- meshconf->conf_pselid[0], meshconf->conf_pselid[1],
- meshconf->conf_pselid[2], meshconf->conf_pselid[3]);
+ "unknown auth auth algorithm: 0x%x\n",
+ meshconf->conf_pselid);
return 1;
}
/* Not accepting peers */
@@ -2394,29 +2383,22 @@ uint8_t *
ieee80211_add_meshconf(uint8_t *frm, struct ieee80211vap *vap)
{
const struct ieee80211_mesh_state *ms = vap->iv_mesh;
- static const uint8_t null[4] = IEEE80211_MESHCONF_NULL;
KASSERT(vap->iv_opmode == IEEE80211_M_MBSS, ("not a MBSS vap"));
*frm++ = IEEE80211_ELEMID_MESHCONF;
*frm++ = sizeof(struct ieee80211_meshconf_ie) - 2;
- *frm++ = IEEE80211_MESHCONF_VERSION;
- memcpy(frm, ms->ms_ppath->mpp_ie, 4); /* path selection */
- frm += 4;
- memcpy(frm, ms->ms_pmetric->mpm_ie, 4); /* link metric */
- frm += 4;
- /* XXX null for now */
- memcpy(frm, null, 4); /* congestion control */
- frm += 4;
- memcpy(frm, null, 4); /* sync */
- frm += 4;
- memcpy(frm, null, 4); /* auth */
- frm += 4;
+ *frm++ = ms->ms_ppath->mpp_ie; /* path selection */
+ *frm++ = ms->ms_pmetric->mpm_ie; /* link metric */
+ *frm++ = IEEE80211_MESHCONF_CC_DISABLED;
+ *frm++ = IEEE80211_MESHCONF_SYNC_NEIGHOFF;
+ *frm++ = IEEE80211_MESHCONF_AUTH_DISABLED;
/* NB: set the number of neighbors before the rest */
*frm = (ms->ms_neighbors > 15 ? 15 : ms->ms_neighbors) << 1;
if (ms->ms_flags & IEEE80211_MESHFLAGS_PORTAL)
*frm |= IEEE80211_MESHCONF_FORM_MP;
frm += 1;
+ *frm = 0;
if (ms->ms_flags & IEEE80211_MESHFLAGS_AP)
*frm |= IEEE80211_MESHCONF_CAP_AP;
if (ms->ms_flags & IEEE80211_MESHFLAGS_FWD)
Modified: user/eri/pf45/head/sys/net80211/ieee80211_mesh.h
==============================================================================
--- user/eri/pf45/head/sys/net80211/ieee80211_mesh.h Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/net80211/ieee80211_mesh.h Tue Oct 13 22:20:05 2009 (r198060)
@@ -43,47 +43,27 @@
struct ieee80211_meshconf_ie {
uint8_t conf_ie; /* IEEE80211_ELEMID_MESHCONF */
uint8_t conf_len;
- uint8_t conf_ver;
- uint8_t conf_pselid[4]; /* Active Path Sel. Proto. ID */
- uint8_t conf_pmetid[4]; /* APS Metric Identifier */
- uint8_t conf_ccid[4]; /* Congestion Control Mode ID */
- uint8_t conf_syncid[4]; /* Sync. Protocol ID */
- uint8_t conf_authid[4]; /* Auth. Protocol ID */
+ uint8_t conf_pselid; /* Active Path Sel. Proto. ID */
+ uint8_t conf_pmetid; /* Active Metric Identifier */
+ uint8_t conf_ccid; /* Congestion Control Mode ID */
+ uint8_t conf_syncid; /* Sync. Protocol ID */
+ uint8_t conf_authid; /* Auth. Protocol ID */
uint8_t conf_form; /* Formation Information */
uint8_t conf_cap;
} __packed;
-#define IEEE80211_MESHCONF_VERSION 1
-/* Null Protocol */
-#define IEEE80211_MESHCONF_NULL_OUI 0x00, 0x0f, 0xac
-#define IEEE80211_MESHCONF_NULL_VALUE 0xff
-#define IEEE80211_MESHCONF_NULL { IEEE80211_MESHCONF_NULL_OUI, \
- IEEE80211_MESHCONF_NULL_VALUE }
/* Hybrid Wireless Mesh Protocol */
-#define IEEE80211_MESHCONF_HWMP_OUI 0x00, 0x0f, 0xac
-#define IEEE80211_MESHCONF_HWMP_VALUE 0x00
-#define IEEE80211_MESHCONF_HWMP { IEEE80211_MESHCONF_HWMP_OUI, \
- IEEE80211_MESHCONF_HWMP_VALUE }
+#define IEEE80211_MESHCONF_PATH_HWMP 0x00
/* Airtime Link Metric */
-#define IEEE80211_MESHCONF_AIRTIME_OUI 0x00, 0x0f, 0xac
-#define IEEE80211_MESHCONF_AIRTIME_VALUE 0x00
-#define IEEE80211_MESHCONF_AIRTIME { IEEE80211_MESHCONF_AIRTIME_OUI, \
- IEEE80211_MESHCONF_AIRTIME_VALUE }
-/* Congestion Control Signaling */
-#define IEEE80211_MESHCONF_CCSIG_OUI 0x00, 0x0f, 0xac
-#define IEEE80211_MESHCONF_CCSIG_VALUE 0x00
-#define IEEE80211_MESHCONF_CCSIG { IEEE80211_MESHCONF_CCSIG_OUI,\
- IEEE80211_MESHCONF_CCSIG_VALUE }
+#define IEEE80211_MESHCONF_METRIC_AIRTIME 0x00
+/* Congestion Control */
+#define IEEE80211_MESHCONF_CC_DISABLED 0x00
+#define IEEE80211_MESHCONF_CC_SIG 0x01
/* Neighbour Offset */
-#define IEEE80211_MESHCONF_NEIGHOFF_OUI 0x00, 0x0f, 0xac
-#define IEEE80211_MESHCONF_NEIGHOFF_VALUE 0x00
-#define IEEE80211_MESHCONF_NEIGHOFF { IEEE80211_MESHCONF_NEIGHOFF_OUI, \
- IEEE80211_MESHCONF_NEIGHOFF_VALUE }
+#define IEEE80211_MESHCONF_SYNC_NEIGHOFF 0x00
+#define IEEE80211_MESHCONF_AUTH_DISABLED 0x00
/* Simultaneous Authenticaction of Equals */
-#define IEEE80211_MESHCONF_SAE_OUI 0x00, 0x0f, 0xac
-#define IEEE80211_MESHCONF_SAE_VALUE 0x01
-#define IEEE80211_MESHCONF_SAE { IEEE80211_MESHCONF_SAE_OUI, \
- IEEE80211_MESHCONF_SAE_VALUE }
+#define IEEE80211_MESHCONF_AUTH_SAE 0x01
#define IEEE80211_MESHCONF_FORM_MP 0x01 /* Connected to Portal */
#define IEEE80211_MESHCONF_FORM_NNEIGH_MASK 0x04 /* Number of Neighbours */
#define IEEE80211_MESHCONF_CAP_AP 0x01 /* Accepting Peers */
@@ -390,8 +370,9 @@ struct ieee80211_mesh_route {
*/
enum ieee80211_state;
struct ieee80211_mesh_proto_path {
+ uint8_t mpp_active;
char mpp_descr[IEEE80211_MESH_PROTO_DSZ];
- uint8_t mpp_ie[4];
+ uint8_t mpp_ie;
struct ieee80211_node *
(*mpp_discover)(struct ieee80211vap *,
const uint8_t [IEEE80211_ADDR_LEN],
@@ -411,8 +392,9 @@ struct ieee80211_mesh_proto_path {
* Mesh Link Metric Report Protocol.
*/
struct ieee80211_mesh_proto_metric {
+ uint8_t mpm_active;
char mpm_descr[IEEE80211_MESH_PROTO_DSZ];
- uint8_t mpm_ie[4];
+ uint8_t mpm_ie;
uint32_t (*mpm_metric)(struct ieee80211_node *);
};
Modified: user/eri/pf45/head/sys/netinet/ip_icmp.c
==============================================================================
--- user/eri/pf45/head/sys/netinet/ip_icmp.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/netinet/ip_icmp.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -367,7 +367,7 @@ icmp_input(struct mbuf *m, int off)
goto freeit;
}
i = hlen + min(icmplen, ICMP_ADVLENMIN);
- if (m->m_len < i && (m = m_pullup(m, i)) == 0) {
+ if (m->m_len < i && (m = m_pullup(m, i)) == NULL) {
ICMPSTAT_INC(icps_tooshort);
return;
}
Modified: user/eri/pf45/head/sys/netinet6/in6_ifattach.c
==============================================================================
--- user/eri/pf45/head/sys/netinet6/in6_ifattach.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/netinet6/in6_ifattach.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -751,16 +751,19 @@ in6_ifattach(struct ifnet *ifp, struct i
* assign a link-local address, if there's none.
*/
if (ifp->if_type != IFT_BRIDGE &&
+ !(ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) &&
ND_IFINFO(ifp)->flags & ND6_IFF_AUTO_LINKLOCAL) {
int error;
ia = in6ifa_ifpforlinklocal(ifp, 0);
if (ia == NULL) {
error = in6_ifattach_linklocal(ifp, altifp);
+#if 0
if (error)
log(LOG_NOTICE, "in6_ifattach_linklocal: "
"failed to add a link-local addr to %s\n",
if_name(ifp));
+#endif
} else
ifa_free(&ia->ia_ifa);
}
Modified: user/eri/pf45/head/sys/nfsclient/nfs_kdtrace.c
==============================================================================
--- user/eri/pf45/head/sys/nfsclient/nfs_kdtrace.c Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/nfsclient/nfs_kdtrace.c Tue Oct 13 22:20:05 2009 (r198060)
@@ -543,3 +543,4 @@ DEV_MODULE(dtnfsclient, dtnfsclient_mode
MODULE_VERSION(dtnfsclient, 1);
MODULE_DEPEND(dtnfsclient, dtrace, 1, 1, 1);
MODULE_DEPEND(dtnfsclient, opensolaris, 1, 1, 1);
+MODULE_DEPEND(dtnfsclient, nfs, 1, 1, 1);
Modified: user/eri/pf45/head/sys/pc98/conf/GENERIC
==============================================================================
--- user/eri/pf45/head/sys/pc98/conf/GENERIC Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/pc98/conf/GENERIC Tue Oct 13 22:20:05 2009 (r198060)
@@ -264,10 +264,6 @@ device bpf # Berkeley packet filter
#device ulpt # Printer
#device umass # Disks/Mass storage - Requires scbus and da
#device ums # Mouse
-#device rum # Ralink Technology RT2501USB wireless NICs
-#device uath # Atheros AR5523 wireless NICs
-#device ural # Ralink Technology RT2500USB wireless NICs
-#device zyd # ZyDAS zb1211/zb1211b wireless NICs
#device urio # Diamond Rio 500 MP3 player
# USB Serial devices
#device uark # Technologies ARK3116 based serial adapters
@@ -287,6 +283,11 @@ device bpf # Berkeley packet filter
#device kue # Kawasaki LSI USB Ethernet
#device rue # RealTek RTL8150 USB Ethernet
#device udav # Davicom DM9601E USB
+# USB Wireless
+#device rum # Ralink Technology RT2501USB wireless NICs
+#device uath # Atheros AR5523 wireless NICs
+#device ural # Ralink Technology RT2500USB wireless NICs
+#device zyd # ZyDAS zb1211/zb1211b wireless NICs
# FireWire support
#device firewire # FireWire bus code
Modified: user/eri/pf45/head/sys/sparc64/conf/GENERIC
==============================================================================
--- user/eri/pf45/head/sys/sparc64/conf/GENERIC Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/sys/sparc64/conf/GENERIC Tue Oct 13 22:20:05 2009 (r198060)
@@ -239,10 +239,6 @@ device ukbd # Keyboard
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
-device rum # Ralink Technology RT2501USB wireless NICs
-device uath # Atheros AR5523 wireless NICs
-device ural # Ralink Technology RT2500USB wireless NICs
-device zyd # ZyDAS zb1211/zb1211b wireless NICs
device urio # Diamond Rio 500 MP3 player
# USB Serial devices
device uark # Technologies ARK3116 based serial adapters
@@ -261,6 +257,11 @@ device cue # CATC USB Ethernet
device kue # Kawasaki LSI USB Ethernet
device rue # RealTek RTL8150 USB Ethernet
device udav # Davicom DM9601E USB
+# USB Wireless
+device rum # Ralink Technology RT2501USB wireless NICs
+device uath # Atheros AR5523 wireless NICs
+device ural # Ralink Technology RT2500USB wireless NICs
+device zyd # ZyDAS zb1211/zb1211b wireless NICs
# FireWire support
device firewire # FireWire bus code
Modified: user/eri/pf45/head/usr.sbin/ntp/doc/ntpd.8
==============================================================================
--- user/eri/pf45/head/usr.sbin/ntp/doc/ntpd.8 Tue Oct 13 22:17:29 2009 (r198059)
+++ user/eri/pf45/head/usr.sbin/ntp/doc/ntpd.8 Tue Oct 13 22:20:05 2009 (r198060)
@@ -121,7 +121,7 @@ Normally,
.Nm
exits with a message to the system log if the offset exceeds
the panic threshold, which is 1000 s by default.
-This option allows thetime to be set to any value without restriction;
+This option allows the time to be set to any value without restriction;
however, this can happen only once.
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list