PERFORCE change 169716 for review
Alexander Motin
mav at FreeBSD.org
Fri Oct 23 14:13:35 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=169716
Change 169716 by mav at mav_mavbook on 2009/10/23 14:13:13
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/etc/rc.d/netoptions#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#42 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#37 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#108 edit
.. //depot/projects/scottl-camlock/src/sys/conf/files#50 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#71 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/cam/Makefile#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_output.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/interrupt.h#15 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/etc/rc.d/netoptions#6 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/netoptions,v 1.150 2009/10/02 06:51:39 hrs Exp $
+# $FreeBSD: src/etc/rc.d/netoptions,v 1.151 2009/10/23 09:30:19 hrs Exp $
#
# PROVIDE: netoptions
@@ -53,7 +53,7 @@
${SYSCTL_W} net.inet.tcp.rfc1323=1 >/dev/null
else
netoptions_init
- echo -n ' rfc1323 extensions=${tcp_extensions}'
+ echo -n " rfc1323 extensions=${tcp_extensions}"
${SYSCTL_W} net.inet.tcp.rfc1323=0 >/dev/null
fi
@@ -61,13 +61,13 @@
${SYSCTL_W} net.inet.tcp.always_keepalive=1 >/dev/null
else
netoptions_init
- echo -n ' TCP keepalive=${tcp_keepalive}'
+ echo -n " TCP keepalive=${tcp_keepalive}"
${SYSCTL_W} net.inet.tcp.always_keepalive=0 >/dev/null
fi
if checkyesno tcp_drop_synfin; then
netoptions_init
- echo -n ' drop SYN+FIN packets=${tcp_drop_synfin}'
+ echo -n " drop SYN+FIN packets=${tcp_drop_synfin}"
${SYSCTL_W} net.inet.tcp.drop_synfin=1 >/dev/null
else
${SYSCTL_W} net.inet.tcp.drop_synfin=0 >/dev/null
==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#42 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.8 2009/10/23 08:27:55 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.9 2009/10/23 12:36:42 mav Exp $");
#include <sys/param.h>
#include <sys/bus.h>
==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#37 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.82 2009/10/23 08:27:55 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.83 2009/10/23 13:39:30 mav Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1767,16 +1767,27 @@
break;
}
+ /*
+ * If we have and error and are booting verbosely, whine
+ * *unless* this was a non-retryable selection timeout.
+ */
+ if (error != 0 && bootverbose &&
+ !(status == CAM_SEL_TIMEOUT && (camflags & CAM_RETRY_SELTO) == 0)) {
+ if (error != ERESTART) {
+ if (action_string == NULL)
+ action_string = "Unretryable Error";
+ xpt_print(ccb->ccb_h.path, "error %d\n", error);
+ xpt_print(ccb->ccb_h.path, "%s\n", action_string);
+ } else
+ xpt_print(ccb->ccb_h.path, "Retrying Command\n");
+ }
+
/* Attempt a retry */
- if (error == ERESTART || error == 0) {
+ if (error == ERESTART || error == 0) {
if (frozen != 0)
ccb->ccb_h.status &= ~CAM_DEV_QFRZN;
-
- if (error == ERESTART) {
- action_string = "Retrying Command";
+ if (error == ERESTART)
xpt_action(ccb);
- }
-
if (frozen != 0)
cam_release_devq(ccb->ccb_h.path,
relsim_flags,
@@ -1785,21 +1796,5 @@
/*getcount_only*/0);
}
- /*
- * If we have and error and are booting verbosely, whine
- * *unless* this was a non-retryable selection timeout.
- */
- if (error != 0 && bootverbose &&
- !(status == CAM_SEL_TIMEOUT && (camflags & CAM_RETRY_SELTO) == 0)) {
-
-
- if (action_string == NULL)
- action_string = "Unretryable Error";
- if (error != ERESTART) {
- xpt_print(ccb->ccb_h.path, "error %d\n", error);
- }
- xpt_print(ccb->ccb_h.path, "%s\n", action_string);
- }
-
return (error);
}
==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#108 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.227 2009/10/23 08:27:55 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.228 2009/10/23 11:26:58 mav Exp $");
#include <sys/param.h>
#include <sys/bus.h>
==== //depot/projects/scottl-camlock/src/sys/conf/files#50 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1477 2009/10/19 21:43:59 thompsa Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1478 2009/10/23 12:36:42 mav Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#71 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.9 2009/10/21 13:00:01 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.10 2009/10/23 13:07:22 mav Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -1001,12 +1001,7 @@
/* XXX: reqests in loading state. */
if (((err >> i) & 1) == 0)
continue;
- if (istatus & AHCI_P_IX_IF) {
- if (ch->numtslots == 0 && i != ccs)
- et = AHCI_ERR_INNOCENT;
- else
- et = AHCI_ERR_SATA;
- } else if (istatus & AHCI_P_IX_TFE) {
+ if (istatus & AHCI_P_IX_TFE) {
/* Task File Error */
if (ch->numtslots == 0) {
/* Untagged operation. */
@@ -1019,6 +1014,11 @@
et = AHCI_ERR_NCQ;
ncq_err = 1;
}
+ } else if (istatus & AHCI_P_IX_IF) {
+ if (ch->numtslots == 0 && i != ccs)
+ et = AHCI_ERR_INNOCENT;
+ else
+ et = AHCI_ERR_SATA;
} else
et = AHCI_ERR_INVALID;
ahci_end_transaction(&ch->slot[i], et);
==== //depot/projects/scottl-camlock/src/sys/modules/cam/Makefile#15 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/cam/Makefile,v 1.16 2009/07/10 08:18:08 scottl Exp $
+# $FreeBSD: src/sys/modules/cam/Makefile,v 1.17 2009/10/23 12:36:42 mav Exp $
S= ${.CURDIR}/../..
==== //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_output.c#21 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.105 2009/10/19 18:46:22 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.106 2009/10/23 11:13:08 rpaulo Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -2764,13 +2764,7 @@
*(uint16_t *)wh->i_dur = 0;
IEEE80211_ADDR_COPY(wh->i_addr1, ifp->if_broadcastaddr);
IEEE80211_ADDR_COPY(wh->i_addr2, vap->iv_myaddr);
-#ifdef IEEE80211_SUPPORT_MESH
- if (vap->iv_opmode == IEEE80211_M_MBSS) {
- static const uint8_t zerobssid[IEEE80211_ADDR_LEN];
- IEEE80211_ADDR_COPY(wh->i_addr3, zerobssid);
- } else
-#endif
- IEEE80211_ADDR_COPY(wh->i_addr3, ni->ni_bssid);
+ IEEE80211_ADDR_COPY(wh->i_addr3, ni->ni_bssid);
*(uint16_t *)wh->i_seq = 0;
return m;
==== //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#26 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.377 2009/10/18 11:23:56 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.378 2009/10/23 13:35:00 rwatson Exp $");
#include "opt_bootp.h"
#include "opt_ipfw.h"
@@ -530,8 +530,8 @@
}
if ((dchg = (m_tag_find(m, PACKET_TAG_IPFORWARD, NULL) != NULL)) != 0) {
/*
- * Directly ship on the packet. This allows to forward
- * packets that were destined for us to some other directly
+ * Directly ship the packet on. This allows forwarding
+ * packets originally destined to us to ome other directly
* connected host.
*/
ip_forward(m, dchg);
==== //depot/projects/scottl-camlock/src/sys/sys/interrupt.h#15 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sys/interrupt.h,v 1.46 2009/10/15 14:54:35 jhb Exp $
+ * $FreeBSD: src/sys/sys/interrupt.h,v 1.47 2009/10/23 13:28:33 jhb Exp $
*/
#ifndef _SYS_INTERRUPT_H_
@@ -168,12 +168,12 @@
void (*post_ithread)(void *), void (*post_filter)(void *),
int (*assign_cpu)(void *, u_char), const char *fmt, ...)
__printflike(9, 10);
+int intr_event_describe_handler(struct intr_event *ie, void *cookie,
+ const char *descr);
int intr_event_destroy(struct intr_event *ie);
void intr_event_execute_handlers(struct proc *p, struct intr_event *ie);
int intr_event_handle(struct intr_event *ie, struct trapframe *frame);
int intr_event_remove_handler(void *cookie);
-int intr_event_describe_handler(struct intr_event *ie, void *cookie,
- const char *descr);
int intr_getaffinity(int irq, void *mask);
void *intr_handler_source(void *cookie);
int intr_setaffinity(int irq, void *mask);
More information about the p4-projects
mailing list