PERFORCE change 103213 for review
John Birrell
jb at FreeBSD.org
Fri Aug 4 23:26:03 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=103213
Change 103213 by jb at jb_freebsd2 on 2006/08/04 23:25:29
IFC
Affected files ...
.. //depot/projects/dtrace/ports/CHANGES#5 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#8 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_sockio.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_ioctl.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_library.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_target.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_target.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_tpublic.h#4 integrate
.. //depot/projects/dtrace/src/sys/net/if_faith.c#4 integrate
.. //depot/projects/dtrace/src/sys/net/if_gif.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_gre.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/if_stf.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/if_var.h#3 integrate
.. //depot/projects/dtrace/src/sys/net/net_osdep.h#4 delete
.. //depot/projects/dtrace/src/sys/netinet/in_gif.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_encap.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ah_aesxcbcmac.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ah_core.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ah_input.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ah_output.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/esp_aesctr.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/esp_core.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/esp_input.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/esp_output.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/esp_rijndael.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/frag6.c#6 integrate
.. //depot/projects/dtrace/src/sys/netinet6/icmp6.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_cksum.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_gif.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_proto.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ip6_forward.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ip6_input.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ip6_mroute.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ip6_output.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ipcomp_core.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ipcomp_input.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ipcomp_output.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ipsec.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/mld6.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/nd6_nbr.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/nd6_rtr.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/udp6_output.c#4 integrate
.. //depot/projects/dtrace/src/sys/netkey/key.c#3 integrate
.. //depot/projects/dtrace/src/sys/netkey/keydb.c#3 integrate
.. //depot/projects/dtrace/src/sys/sys/time.h#7 integrate
.. //depot/projects/dtrace/src/sys/sys/types.h#4 integrate
.. //depot/projects/dtrace/src/tools/regression/fsx/fsx.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/kldxref/Makefile#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/kldxref/kldxref.c#4 integrate
Differences ...
==== //depot/projects/dtrace/ports/CHANGES#5 (text+ko) ====
@@ -10,6 +10,33 @@
All ports committers are allowed to commit to this file.
+20060805:
+AUTHOR: sat at FreeBSD.org
+The following functional changes were made to bsd.sites.mk:
+
+ * MASTER_SITES variable can now contain special macros which are expanded into
+ traditional URL[:group] syntax and cause some convenient effects, e.g. set a
+ default M_S_SUBDIR.
+
+ * A macro is any space-delimited word in MASTER_SITES without a forward slash.
+
+ * If MASTER_SITE_<macro> is defined, then the macro is expanded to its value.
+
+ * Abbreviated macros are provided for extremely popular locations, e.g. CPAN
+ and SF. To avoid further obfuscation their unabbreviated equivalents should
+ be avoided.
+
+ * Popular macros can trigger M_S_SUBDIR to default to a predefined value, e.g.
+ ${PORTNAME:L} for SF and ${PORTNAME:C/-.*//} for CPAN.
+
+ * Abbreviations and M_S_SUBDIR defaults are defined by MASTER_SITES_ABBREVS
+ and MASTER_SITES_SUBDIRS, both set in bsd.sites.mk.
+
+ * If a macro belongs to a group (e.g. SF:source1), all the sites it expands
+ into also belong to the same group.
+
+ * Macros and traditional URL's can be mixed safely, their order stays intact.
+
20060804:
AUTHOR: gabor at FreeBSD.org
The following functional changes were made to bsd.*.mk and to
@@ -1149,4 +1176,4 @@
Contact Erwin Lansing if you have any questions about your use of
this document.
-$FreeBSD: ports/CHANGES,v 1.57 2006/08/04 13:17:59 erwin Exp $
+$FreeBSD: ports/CHANGES,v 1.58 2006/08/04 20:44:18 sat Exp $
==== //depot/projects/dtrace/src/ObsoleteFiles.inc#8 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.41 2006/07/08 03:22:44 avatar Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.42 2006/08/04 21:29:22 brooks Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20060704: KAME compat file net_osdep.h removed
+OLD_FILES+=usr/include/net/net_osdep.h
# 20060517: pcvt removed
OLD_FILES+=usr/share/pcvt/README.FIRST
OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german
==== //depot/projects/dtrace/src/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.17 2005/08/09 10:19:41 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -104,7 +104,7 @@
*/
IFNET_RLOCK();
TAILQ_FOREACH(ifp, &ifnet, if_link)
- if (TAILQ_FIRST(&ifp->if_addrhead) == NULL)
+ if (TAILQ_EMPTY(&ifp->if_addrhead))
ifnum++;
else
TAILQ_FOREACH(ifa, &ifp->if_addrhead,
==== //depot/projects/dtrace/src/sys/dev/isp/isp.c#6 (text+ko) ====
@@ -42,7 +42,7 @@
#endif
#ifdef __FreeBSD__
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.123 2006/07/16 20:11:49 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.124 2006/08/04 20:14:52 mjacob Exp $");
#include <dev/isp/isp_freebsd.h>
#endif
#ifdef __OpenBSD__
@@ -226,6 +226,10 @@
isp->isp_rqstoutrp = BIU_REQOUTP;
isp->isp_respinrp = BIU_RSPINP;
isp->isp_respoutrp = BIU_RSPOUTP;
+ ISP_WRITE(isp, isp->isp_rqstinrp, 0);
+ ISP_WRITE(isp, isp->isp_rqstoutrp, 0);
+ ISP_WRITE(isp, isp->isp_respinrp, 0);
+ ISP_WRITE(isp, isp->isp_respoutrp, 0);
} else {
isp->isp_rqstinrp = INMAILBOX4;
isp->isp_rqstoutrp = OUTMAILBOX4;
@@ -1438,13 +1442,6 @@
icbp->icb_logintime = ICB_LOGIN_TOV;
icbp->icb_lunetimeout = ICB_LUN_ENABLE_TOV;
- if (IS_23XX(isp)) {
- ISP_WRITE(isp, isp->isp_rqstinrp, 0);
- ISP_WRITE(isp, isp->isp_rqstoutrp, 0);
- ISP_WRITE(isp, isp->isp_respinrp, 0);
- ISP_WRITE(isp, isp->isp_respoutrp, 0);
- }
-
nwwn = ISP_NODEWWN(isp);
pwwn = ISP_PORTWWN(isp);
if (nwwn && pwwn) {
==== //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#7 (text+ko) ====
@@ -29,7 +29,7 @@
* Platform (FreeBSD) dependent common attachment code for Qlogic adapters.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.120 2006/07/16 20:11:49 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.121 2006/08/04 20:13:27 mjacob Exp $");
#include <dev/isp/isp_freebsd.h>
#include <sys/unistd.h>
#include <sys/kthread.h>
@@ -562,29 +562,29 @@
loopid <<= 8;
}
switch (fct->action) {
- case CLEAR_ACA:
+ case IPT_CLEAR_ACA:
mbs.param[0] = MBOX_CLEAR_ACA;
mbs.param[1] = loopid;
mbs.param[2] = fct->lun;
break;
- case TARGET_RESET:
+ case IPT_TARGET_RESET:
mbs.param[0] = MBOX_TARGET_RESET;
mbs.param[1] = loopid;
needmarker = 1;
break;
- case LUN_RESET:
+ case IPT_LUN_RESET:
mbs.param[0] = MBOX_LUN_RESET;
mbs.param[1] = loopid;
mbs.param[2] = fct->lun;
needmarker = 1;
break;
- case CLEAR_TASK_SET:
+ case IPT_CLEAR_TASK_SET:
mbs.param[0] = MBOX_CLEAR_TASK_SET;
mbs.param[1] = loopid;
mbs.param[2] = fct->lun;
needmarker = 1;
break;
- case ABORT_TASK_SET:
+ case IPT_ABORT_TASK_SET:
mbs.param[0] = MBOX_ABORT_TASK_SET;
mbs.param[1] = loopid;
mbs.param[2] = fct->lun;
==== //depot/projects/dtrace/src/sys/dev/isp/isp_ioctl.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/isp/isp_ioctl.h,v 1.16 2006/04/21 18:30:00 mjacob Exp $ */
+/* $FreeBSD: src/sys/dev/isp/isp_ioctl.h,v 1.17 2006/08/04 20:14:03 mjacob Exp $ */
/*-
*
* Copyright (c) 1997-2006 by Matthew Jacob
@@ -188,7 +188,11 @@
uint32_t loopid; /* 0..255 */
uint32_t lun;
enum {
- CLEAR_ACA, TARGET_RESET, LUN_RESET, CLEAR_TASK_SET, ABORT_TASK_SET
+ IPT_CLEAR_ACA,
+ IPT_TARGET_RESET,
+ IPT_LUN_RESET,
+ IPT_CLEAR_TASK_SET,
+ IPT_ABORT_TASK_SET
} action;
};
#define ISP_TSK_MGMT _IOWR(ISP_IOC, 97, struct isp_fc_tsk_mgmt)
==== //depot/projects/dtrace/src/sys/dev/isp/isp_library.c#5 (text) ====
@@ -32,7 +32,7 @@
#endif
#ifdef __FreeBSD__
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.4 2006/07/16 20:11:49 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.5 2006/08/04 20:20:00 mjacob Exp $");
#include <dev/isp/isp_freebsd.h>
#endif
#ifdef __OpenBSD__
@@ -1648,9 +1648,9 @@
int i;
isp_copy_out_hdr(isp, &nasrc->na_header, &nadst->na_header);
ISP_IOXPUT_32(isp, nasrc->na_reserved, &nadst->na_reserved);
- ISP_IOXPUT_8(isp, nasrc->na_lun, &nadst->na_lun);
+ ISP_IOXPUT_8(isp, nasrc->na_reserved1, &nadst->na_reserved1);
ISP_IOXPUT_8(isp, nasrc->na_iid, &nadst->na_iid);
- ISP_IOXPUT_16(isp, nasrc->na_scclun, &nadst->na_scclun);
+ ISP_IOXPUT_16(isp, nasrc->na_response, &nadst->na_response);
ISP_IOXPUT_16(isp, nasrc->na_flags, &nadst->na_flags);
ISP_IOXPUT_16(isp, nasrc->na_reserved2, &nadst->na_reserved2);
ISP_IOXPUT_16(isp, nasrc->na_status, &nadst->na_status);
@@ -1670,7 +1670,7 @@
isp_copy_out_hdr(isp, &nasrc->na_header, &nadst->na_header);
ISP_IOXPUT_32(isp, nasrc->na_reserved, &nadst->na_reserved);
ISP_IOXPUT_16(isp, nasrc->na_iid, &nadst->na_iid);
- ISP_IOXPUT_16(isp, nasrc->na_scclun, &nadst->na_scclun);
+ ISP_IOXPUT_16(isp, nasrc->na_response, &nadst->na_response);
ISP_IOXPUT_16(isp, nasrc->na_flags, &nadst->na_flags);
ISP_IOXPUT_16(isp, nasrc->na_reserved2, &nadst->na_reserved2);
ISP_IOXPUT_16(isp, nasrc->na_status, &nadst->na_status);
@@ -1689,9 +1689,9 @@
int i;
isp_copy_in_hdr(isp, &nasrc->na_header, &nadst->na_header);
ISP_IOXGET_32(isp, &nasrc->na_reserved, nadst->na_reserved);
- ISP_IOXGET_8(isp, &nasrc->na_lun, nadst->na_lun);
+ ISP_IOXGET_8(isp, &nasrc->na_reserved1, nadst->na_reserved1);
ISP_IOXGET_8(isp, &nasrc->na_iid, nadst->na_iid);
- ISP_IOXGET_16(isp, &nasrc->na_scclun, nadst->na_scclun);
+ ISP_IOXGET_16(isp, &nasrc->na_response, nadst->na_response);
ISP_IOXGET_16(isp, &nasrc->na_flags, nadst->na_flags);
ISP_IOXGET_16(isp, &nasrc->na_reserved2, nadst->na_reserved2);
ISP_IOXGET_16(isp, &nasrc->na_status, nadst->na_status);
@@ -1711,7 +1711,7 @@
isp_copy_in_hdr(isp, &nasrc->na_header, &nadst->na_header);
ISP_IOXGET_32(isp, &nasrc->na_reserved, nadst->na_reserved);
ISP_IOXGET_16(isp, &nasrc->na_iid, nadst->na_iid);
- ISP_IOXGET_16(isp, &nasrc->na_scclun, nadst->na_scclun);
+ ISP_IOXGET_16(isp, &nasrc->na_response, nadst->na_response);
ISP_IOXGET_16(isp, &nasrc->na_flags, nadst->na_flags);
ISP_IOXGET_16(isp, &nasrc->na_reserved2, nadst->na_reserved2);
ISP_IOXGET_16(isp, &nasrc->na_status, nadst->na_status);
==== //depot/projects/dtrace/src/sys/dev/isp/isp_target.c#6 (text+ko) ====
@@ -38,7 +38,7 @@
#endif
#ifdef __FreeBSD__
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/isp/isp_target.c,v 1.38 2006/07/16 20:11:50 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_target.c,v 1.39 2006/08/04 20:20:00 mjacob Exp $");
#include <dev/isp/isp_freebsd.h>
#endif
#ifdef __OpenBSD__
@@ -195,10 +195,12 @@
bus = 0;
if (IS_FC(isp)) {
if (IS_2KLOGIN(isp)) {
- isp_get_notify_fc_e(isp, inote_fcp, (in_fcentry_e_t *)local);
- } else {
- isp_get_notify_fc(isp, inot_fcp, (in_fcentry_t *)local);
- }
+ isp_get_notify_fc_e(isp, inote_fcp,
+ (in_fcentry_e_t *)local);
+ } else {
+ isp_get_notify_fc(isp, inot_fcp,
+ (in_fcentry_t *)local);
+ }
inot_fcp = (in_fcentry_t *) local;
status = inot_fcp->in_status;
seqid = inot_fcp->in_seqid;
@@ -212,6 +214,7 @@
SET_BUS_VAL(inotp->in_iid, 0);
}
}
+
isp_prt(isp, ISP_LOGTDEBUG0,
"Immediate Notify On Bus %d, status=0x%x seqid=0x%x",
bus, status, seqid);
@@ -676,18 +679,20 @@
isp_got_msg_fc(ispsoftc_t *isp, in_fcentry_t *inp)
{
tmd_notify_t nt;
- static const char f1[] = "%s from iid 0x%08x%08x lun %d seq 0x%x";
+ static const char f1[] = "%s from loop id %d lun %d seq 0x%x";
static const char f2[] =
- "unknown %s 0x%x lun %d iid 0x%08x%08x task flags 0x%x seq 0x%x\n";
- uint16_t seqid;
+ "unknown %s 0x%x lun %d loop id %d task flags 0x%x seq 0x%x\n";
+ uint16_t seqid, loopid;
MEMZERO(&nt, sizeof (tmd_notify_t));
nt.nt_hba = isp;
if (IS_2KLOGIN(isp)) {
nt.nt_iid = ((in_fcentry_e_t *)inp)->in_iid;
+ loopid = ((in_fcentry_e_t *)inp)->in_iid;
seqid = ((in_fcentry_e_t *)inp)->in_seqid;
} else {
nt.nt_iid = inp->in_iid;
+ loopid = inp->in_iid;
seqid = inp->in_seqid;
}
/* nt_tgt set in outer layers */
@@ -701,36 +706,35 @@
if (inp->in_status != IN_MSG_RECEIVED) {
isp_prt(isp, ISP_LOGINFO, f2, "immediate notify status",
- inp->in_status, nt.nt_lun, (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid,
- inp->in_task_flags, inp->in_seqid);
+ inp->in_status, nt.nt_lun, loopid, inp->in_task_flags,
+ inp->in_seqid);
isp_notify_ack(isp, inp);
return;
}
if (inp->in_task_flags & TASK_FLAGS_ABORT_TASK_SET) {
isp_prt(isp, ISP_LOGINFO, f1, "ABORT TASK SET",
- (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid, nt.nt_lun, inp->in_seqid);
+ loopid, nt.nt_lun, inp->in_seqid);
nt.nt_ncode = NT_ABORT_TASK_SET;
} else if (inp->in_task_flags & TASK_FLAGS_CLEAR_TASK_SET) {
isp_prt(isp, ISP_LOGINFO, f1, "CLEAR TASK SET",
- (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid, nt.nt_lun, inp->in_seqid);
+ loopid, nt.nt_lun, inp->in_seqid);
nt.nt_ncode = NT_CLEAR_TASK_SET;
} else if (inp->in_task_flags & TASK_FLAGS_LUN_RESET) {
isp_prt(isp, ISP_LOGINFO, f1, "LUN RESET",
- (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid, nt.nt_lun, inp->in_seqid);
+ loopid, nt.nt_lun, inp->in_seqid);
nt.nt_ncode = NT_LUN_RESET;
} else if (inp->in_task_flags & TASK_FLAGS_TARGET_RESET) {
isp_prt(isp, ISP_LOGINFO, f1, "TARGET RESET",
- (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid, nt.nt_lun, inp->in_seqid);
+ loopid, nt.nt_lun, inp->in_seqid);
nt.nt_ncode = NT_TARGET_RESET;
} else if (inp->in_task_flags & TASK_FLAGS_CLEAR_ACA) {
isp_prt(isp, ISP_LOGINFO, f1, "CLEAR ACA",
- (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid, nt.nt_lun, inp->in_seqid);
+ loopid, nt.nt_lun, inp->in_seqid);
nt.nt_ncode = NT_CLEAR_ACA;
} else {
- isp_prt(isp, ISP_LOGWARN, f2, "task flag",
- inp->in_status, nt.nt_lun, (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid,
- inp->in_task_flags, inp->in_seqid);
+ isp_prt(isp, ISP_LOGWARN, f2, "task flag", inp->in_status,
+ nt.nt_lun, loopid, inp->in_task_flags, inp->in_seqid);
isp_notify_ack(isp, inp);
return;
}
@@ -754,36 +758,45 @@
if (IS_FC(isp)) {
na_fcentry_t *na = (na_fcentry_t *) storage;
+ int iid = 0;
+
if (arg) {
in_fcentry_t *inp = arg;
MEMCPY(storage, arg, sizeof (isphdr_t));
if (IS_2KLOGIN(isp)) {
- ((na_fcentry_e_t *)na)->na_iid = ((in_fcentry_e_t *)inp)->in_iid;
+ ((na_fcentry_e_t *)na)->na_iid =
+ ((in_fcentry_e_t *)inp)->in_iid;
+ iid = ((na_fcentry_e_t *)na)->na_iid;
} else {
na->na_iid = inp->in_iid;
+ iid = na->na_iid;
}
- if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_SCCLUN) {
- na->na_lun = inp->in_scclun;
- } else {
- na->na_lun = inp->in_lun;
- }
- na->na_task_flags = inp->in_task_flags;
+ na->na_task_flags =
+ inp->in_task_flags & TASK_FLAGS_RESERVED_MASK;
na->na_seqid = inp->in_seqid;
na->na_flags = NAFC_RCOUNT;
na->na_status = inp->in_status;
if (inp->in_status == IN_RESET) {
na->na_flags |= NAFC_RST_CLRD;
}
+ if (inp->in_status == IN_MSG_RECEIVED) {
+ na->na_flags |= NAFC_TVALID;
+ na->na_response = 0; /* XXX SUCCEEDED XXX */
+ }
} else {
na->na_flags = NAFC_RST_CLRD;
}
na->na_header.rqs_entry_type = RQSTYPE_NOTIFY_ACK;
na->na_header.rqs_entry_count = 1;
if (IS_2KLOGIN(isp)) {
- isp_put_notify_ack_fc_e(isp, (na_fcentry_e_t *) na, (na_fcentry_e_t *)outp);
+ isp_put_notify_ack_fc_e(isp, (na_fcentry_e_t *) na,
+ (na_fcentry_e_t *)outp);
} else {
isp_put_notify_ack_fc(isp, na, (na_fcentry_t *)outp);
}
+ isp_prt(isp, ISP_LOGTDEBUG0, "notify ack iid %u seqid %x flags "
+ "%x tflags %x response %x", iid, na->na_seqid,
+ na->na_flags, na->na_task_flags, na->na_response);
} else {
na_entry_t *na = (na_entry_t *) storage;
if (arg) {
@@ -802,6 +815,9 @@
na->na_header.rqs_entry_type = RQSTYPE_NOTIFY_ACK;
na->na_header.rqs_entry_count = 1;
isp_put_notify_ack(isp, na, (na_entry_t *)outp);
+ isp_prt(isp, ISP_LOGTDEBUG0, "notify ack iid %u lun %u tgt %u "
+ "seqid %x event %x", na->na_iid, na->na_lun, na->na_tgt,
+ na->na_seqid, na->na_event);
}
ISP_TDQE(isp, "isp_notify_ack", (int) optr, storage);
ISP_ADD_REQUEST(isp, nxti);
@@ -1192,7 +1208,8 @@
if (fmsg == NULL)
fmsg = "ABORT Task Management Function Received";
- isp_prt(isp, ISP_LOGERR, "CTIO2 destroyed by %s: RX_ID=0x%x", fmsg, ct->ct_rxid);
+ isp_prt(isp, ISP_LOGERR, "CTIO2 destroyed by %s: RX_ID=0x%x",
+ fmsg, ct->ct_rxid);
break;
case CT_INVAL:
==== //depot/projects/dtrace/src/sys/dev/isp/isp_target.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.26 2006/04/21 18:30:01 mjacob Exp $ */
+/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.27 2006/08/04 20:20:00 mjacob Exp $ */
/*-
* Qlogic Target Mode Structure and Flag Definitions
*
@@ -148,6 +148,7 @@
/*
* Values for the in_task_flags field- should only get one at a time!
*/
+#define TASK_FLAGS_RESERVED_MASK (0xe700)
#define TASK_FLAGS_CLEAR_ACA (1<<14)
#define TASK_FLAGS_TARGET_RESET (1<<13)
#define TASK_FLAGS_LUN_RESET (1<<12)
@@ -205,9 +206,9 @@
typedef struct {
isphdr_t na_header;
uint32_t na_reserved;
- uint8_t na_lun; /* lun */
- uint8_t na_iid; /* initiator */
- uint16_t na_scclun;
+ uint8_t na_reserved1;
+ uint8_t na_iid; /* initiator loop id */
+ uint16_t na_response;
uint16_t na_flags;
uint16_t na_reserved2;
uint16_t na_status;
@@ -219,8 +220,8 @@
typedef struct {
isphdr_t na_header;
uint32_t na_reserved;
- uint16_t na_iid; /* initiator */
- uint16_t na_scclun;
+ uint16_t na_iid; /* initiator loop id */
+ uint16_t na_response; /* response code */
uint16_t na_flags;
uint16_t na_reserved2;
uint16_t na_status;
@@ -231,6 +232,8 @@
#define NAFC_RCOUNT 0x80 /* increment resource count */
#define NAFC_RST_CLRD 0x20 /* Clear LIP Reset */
+#define NAFC_TVALID 0x10 /* task mangement response code is valid */
+
/*
* Accept Target I/O Entry structure
*/
==== //depot/projects/dtrace/src/sys/dev/isp/isp_tpublic.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/isp/isp_tpublic.h,v 1.14 2006/05/22 06:47:42 mjacob Exp $ */
+/* $FreeBSD: src/sys/dev/isp/isp_tpublic.h,v 1.15 2006/08/04 20:20:55 mjacob Exp $ */
/*-
* Qlogic ISP Host Adapter Public Target Interface Structures && Routines
*
@@ -279,7 +279,7 @@
uint32_t longs[QCDS / sizeof (uint32_t)];
uint16_t shorts[QCDS / sizeof (uint16_t)];
uint8_t bytes[QCDS];
- } cd_lreserved[2], cd_hreserved[2];
+ } cd_lreserved[3], cd_hreserved[3];
} tmd_cmd_t;
/* defined tags */
==== //depot/projects/dtrace/src/sys/net/if_faith.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/net/if_faith.c,v 1.41 2006/07/09 06:04:00 sam Exp $
+ * $FreeBSD: src/sys/net/if_faith.c,v 1.42 2006/08/04 21:27:37 brooks Exp $
*/
/*
* derived from
@@ -78,8 +78,6 @@
#include <netinet6/ip6_var.h>
#endif
-#include <net/net_osdep.h>
-
#define FAITHNAME "faith"
struct faith_softc {
==== //depot/projects/dtrace/src/sys/net/if_gif.c#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/net/if_gif.c,v 1.64 2006/07/27 21:01:47 thompsa Exp $ */
+/* $FreeBSD: src/sys/net/if_gif.c,v 1.65 2006/08/04 21:27:37 brooks Exp $ */
/* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */
/*-
@@ -84,8 +84,6 @@
#include <net/if_bridgevar.h>
#include <net/if_gif.h>
-#include <net/net_osdep.h>
-
#define GIFNAME "gif"
/*
==== //depot/projects/dtrace/src/sys/net/if_gre.c#5 (text+ko) ====
@@ -83,7 +83,6 @@
#include <net/bpf.h>
-#include <net/net_osdep.h>
#include <net/if_gre.h>
/*
==== //depot/projects/dtrace/src/sys/net/if_stf.c#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/net/if_stf.c,v 1.57 2006/07/09 06:04:00 sam Exp $ */
+/* $FreeBSD: src/sys/net/if_stf.c,v 1.58 2006/08/04 21:27:37 brooks Exp $ */
/* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */
/*-
@@ -115,8 +115,6 @@
#include <machine/stdarg.h>
-#include <net/net_osdep.h>
-
#include <net/bpf.h>
#define STFNAME "stf"
==== //depot/projects/dtrace/src/sys/net/if_var.h#3 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* From: @(#)if.h 8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/if_var.h,v 1.107 2006/06/19 22:20:44 mlaier Exp $
+ * $FreeBSD: src/sys/net/if_var.h,v 1.108 2006/08/04 21:27:37 brooks Exp $
*/
#ifndef _NET_IF_VAR_H_
@@ -222,6 +222,7 @@
/* for compatibility with other BSDs */
#define if_addrlist if_addrhead
#define if_list if_link
+#define if_name(ifp) ((ifp)->if_xname)
/*
* Locks for address lists on the network interface.
==== //depot/projects/dtrace/src/sys/netinet/in_gif.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet/in_gif.c,v 1.34 2006/01/30 08:39:09 glebius Exp $ */
+/* $FreeBSD: src/sys/netinet/in_gif.c,v 1.35 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $ */
/*-
@@ -68,8 +68,6 @@
#include <net/if_gif.h>
-#include <net/net_osdep.h>
-
static int gif_validate4(const struct ip *, struct gif_softc *,
struct ifnet *);
==== //depot/projects/dtrace/src/sys/netinet/ip_encap.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet/ip_encap.c,v 1.21 2005/10/31 15:41:27 rwatson Exp $ */
+/* $FreeBSD: src/sys/netinet/ip_encap.c,v 1.22 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: ip_encap.c,v 1.41 2001/03/15 08:35:08 itojun Exp $ */
/*-
@@ -87,8 +87,6 @@
#include <machine/stdarg.h>
-#include <net/net_osdep.h>
-
#include <sys/kernel.h>
#include <sys/malloc.h>
static MALLOC_DEFINE(M_NETADDR, "encap_export_host", "Export host address structure");
==== //depot/projects/dtrace/src/sys/netinet6/ah_aesxcbcmac.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netinet6/ah_aesxcbcmac.c,v 1.3 2005/07/27 08:41:17 cperciva Exp $
+ * $FreeBSD: src/sys/netinet6/ah_aesxcbcmac.c,v 1.4 2006/08/04 21:27:38 brooks Exp $
*/
#include <sys/param.h>
@@ -52,8 +52,6 @@
#include <crypto/rijndael/rijndael.h>
-#include <net/net_osdep.h>
-
#define AES_BLOCKSIZE 16
typedef struct {
==== //depot/projects/dtrace/src/sys/netinet6/ah_core.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/ah_core.c,v 1.26 2005/07/25 12:31:42 ume Exp $ */
+/* $FreeBSD: src/sys/netinet6/ah_core.c,v 1.27 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: ah_core.c,v 1.59 2003/07/25 10:17:14 itojun Exp $ */
/*-
@@ -91,8 +91,6 @@
#include <opencrypto/rmd160.h>
#define RIPEMD160_RESULTLEN 20
-#include <net/net_osdep.h>
-
static int ah_sumsiz_1216 __P((struct secasvar *));
static int ah_sumsiz_zero __P((struct secasvar *));
static int ah_common_mature __P((struct secasvar *));
==== //depot/projects/dtrace/src/sys/netinet6/ah_input.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/ah_input.c,v 1.20 2005/01/07 02:30:34 imp Exp $ */
+/* $FreeBSD: src/sys/netinet6/ah_input.c,v 1.21 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: ah_input.c,v 1.67 2002/01/07 11:39:56 kjc Exp $ */
/*-
@@ -90,8 +90,6 @@
#include <machine/stdarg.h>
-#include <net/net_osdep.h>
-
#define IPLEN_FLIPPED
#ifdef INET
==== //depot/projects/dtrace/src/sys/netinet6/ah_output.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/ah_output.c,v 1.15 2005/01/07 02:30:34 imp Exp $ */
+/* $FreeBSD: src/sys/netinet6/ah_output.c,v 1.16 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: ah_output.c,v 1.38 2003/09/06 05:15:43 itojun Exp $ */
/*-
@@ -74,8 +74,6 @@
#include <netkey/key.h>
#include <netkey/keydb.h>
-#include <net/net_osdep.h>
-
#ifdef INET
static struct in_addr *ah4_finaldst __P((struct mbuf *));
#endif
==== //depot/projects/dtrace/src/sys/netinet6/esp_aesctr.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netinet6/esp_aesctr.c,v 1.3 2005/10/12 09:13:48 ume Exp $
+ * $FreeBSD: src/sys/netinet6/esp_aesctr.c,v 1.4 2006/08/04 21:27:38 brooks Exp $
*/
#include <sys/param.h>
@@ -51,8 +51,6 @@
#include <crypto/rijndael/rijndael.h>
-#include <net/net_osdep.h>
-
#define AES_BLOCKSIZE 16
#define NONCESIZE 4
==== //depot/projects/dtrace/src/sys/netinet6/esp_core.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/esp_core.c,v 1.23 2005/03/11 12:37:06 ume Exp $ */
+/* $FreeBSD: src/sys/netinet6/esp_core.c,v 1.24 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: esp_core.c,v 1.50 2000/11/02 12:27:38 itojun Exp $ */
/*-
@@ -85,8 +85,6 @@
#define cast128_decrypt(key, inblock, outblock) \
cast_decrypt((key), (inblock), (outblock))
-#include <net/net_osdep.h>
-
static int esp_null_mature __P((struct secasvar *));
static int esp_null_decrypt __P((struct mbuf *, size_t,
struct secasvar *, const struct esp_algorithm *, int));
==== //depot/projects/dtrace/src/sys/netinet6/esp_input.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/esp_input.c,v 1.26 2005/01/07 02:30:34 imp Exp $ */
+/* $FreeBSD: src/sys/netinet6/esp_input.c,v 1.27 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: esp_input.c,v 1.62 2002/01/07 11:39:57 kjc Exp $ */
/*-
@@ -89,8 +89,6 @@
#include <machine/stdarg.h>
-#include <net/net_osdep.h>
-
#define IPLEN_FLIPPED
#define ESPMAXLEN \
==== //depot/projects/dtrace/src/sys/netinet6/esp_output.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/esp_output.c,v 1.13 2005/01/07 02:30:34 imp Exp $ */
+/* $FreeBSD: src/sys/netinet6/esp_output.c,v 1.14 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: esp_output.c,v 1.44 2001/07/26 06:53:15 jinmei Exp $ */
/*-
@@ -77,8 +77,6 @@
#include <netkey/key.h>
#include <netkey/keydb.h>
-#include <net/net_osdep.h>
-
static int esp_output __P((struct mbuf *, u_char *, struct mbuf *,
struct ipsecrequest *, int));
==== //depot/projects/dtrace/src/sys/netinet6/esp_rijndael.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/esp_rijndael.c,v 1.5 2005/01/07 02:30:34 imp Exp $ */
+/* $FreeBSD: src/sys/netinet6/esp_rijndael.c,v 1.6 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: esp_rijndael.c,v 1.14 2003/08/28 08:23:20 itojun Exp $ */
/*-
@@ -45,8 +45,6 @@
#include <crypto/rijndael/rijndael.h>
-#include <net/net_osdep.h>
-
size_t
esp_rijndael_schedlen(algo)
const struct esp_algorithm *algo;
==== //depot/projects/dtrace/src/sys/netinet6/frag6.c#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/frag6.c,v 1.28 2006/05/04 18:41:08 bz Exp $ */
+/* $FreeBSD: src/sys/netinet6/frag6.c,v 1.29 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: frag6.c,v 1.33 2002/01/07 11:34:48 kjc Exp $ */
/*-
@@ -53,8 +53,6 @@
#include <netinet/in_systm.h> /* for ECN definitions */
#include <netinet/ip.h> /* for ECN definitions */
-#include <net/net_osdep.h>
-
/*
* Define it to get a correct behavior on per-interface statistics.
* You will need to perform an extra routing table lookup, per fragment,
==== //depot/projects/dtrace/src/sys/netinet6/icmp6.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.70 2006/07/23 12:24:22 rwatson Exp $ */
+/* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.71 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $ */
/*-
@@ -109,8 +109,6 @@
#include <netipsec/key.h>
#endif
-#include <net/net_osdep.h>
-
extern struct domain inet6domain;
struct icmp6stat icmp6stat;
==== //depot/projects/dtrace/src/sys/netinet6/in6.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/in6.c,v 1.62 2006/06/29 19:22:05 yar Exp $ */
+/* $FreeBSD: src/sys/netinet6/in6.c,v 1.63 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $ */
/*-
@@ -97,8 +97,6 @@
#include <netinet6/scope6_var.h>
#include <netinet6/in6_pcb.h>
-#include <net/net_osdep.h>
-
MALLOC_DEFINE(M_IP6MADDR, "in6_multi", "internet multicast address");
/*
==== //depot/projects/dtrace/src/sys/netinet6/in6_cksum.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/in6_cksum.c,v 1.13 2006/06/30 18:25:07 yar Exp $ */
+/* $FreeBSD: src/sys/netinet6/in6_cksum.c,v 1.14 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: in6_cksum.c,v 1.10 2000/12/03 00:53:59 itojun Exp $ */
/*-
@@ -68,8 +68,6 @@
#include <netinet/ip6.h>
#include <netinet6/scope6_var.h>
-#include <net/net_osdep.h>
-
/*
* Checksum routine for Internet Protocol family headers (Portable Version).
*
==== //depot/projects/dtrace/src/sys/netinet6/in6_gif.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/in6_gif.c,v 1.25 2006/02/05 09:52:40 ume Exp $ */
+/* $FreeBSD: src/sys/netinet6/in6_gif.c,v 1.26 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $ */
/*-
@@ -68,8 +68,6 @@
#include <net/if_gif.h>
-#include <net/net_osdep.h>
-
static int gif_validate6(const struct ip6_hdr *, struct gif_softc *,
struct ifnet *);
==== //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.32 2006/04/23 15:06:15 rwatson Exp $ */
+/* $FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.33 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: in6_ifattach.c,v 1.118 2001/05/24 07:44:00 itojun Exp $ */
/*-
@@ -58,8 +58,6 @@
#include <netinet6/nd6.h>
#include <netinet6/scope6_var.h>
-#include <net/net_osdep.h>
-
unsigned long in6_maxmtu = 0;
#ifdef IP6_AUTO_LINKLOCAL
==== //depot/projects/dtrace/src/sys/netinet6/in6_proto.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/in6_proto.c,v 1.37 2005/11/09 13:29:15 ru Exp $ */
+/* $FreeBSD: src/sys/netinet6/in6_proto.c,v 1.38 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $ */
/*-
@@ -138,8 +138,6 @@
#include <netinet6/ip6protosw.h>
-#include <net/net_osdep.h>
-
/*
* TCP/IP protocol family: IP6, ICMP6, UDP, TCP.
*/
==== //depot/projects/dtrace/src/sys/netinet6/in6_src.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/in6_src.c,v 1.38 2006/05/23 00:32:22 tanimura Exp $ */
+/* $FreeBSD: src/sys/netinet6/in6_src.c,v 1.39 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: in6_src.c,v 1.132 2003/08/26 04:42:27 keiichi Exp $ */
/*-
@@ -93,8 +93,6 @@
#include <netinet6/scope6_var.h>
#include <netinet6/nd6.h>
-#include <net/net_osdep.h>
-
static struct mtx addrsel_lock;
#define ADDRSEL_LOCK_INIT() mtx_init(&addrsel_lock, "addrsel_lock", NULL, MTX_DEF)
#define ADDRSEL_LOCK() mtx_lock(&addrsel_lock)
==== //depot/projects/dtrace/src/sys/netinet6/ip6_forward.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/ip6_forward.c,v 1.33 2006/05/12 20:39:23 mlaier Exp $ */
+/* $FreeBSD: src/sys/netinet6/ip6_forward.c,v 1.34 2006/08/04 21:27:38 brooks Exp $ */
/* $KAME: ip6_forward.c,v 1.69 2001/05/17 03:48:30 itojun Exp $ */
/*-
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list