# This is a BitKeeper generated patch for the following project:
# Project Name: greg k-h's linux 2.4 USB kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.802 -> 1.803
# drivers/usb/Config.in 1.48 -> 1.49
# drivers/usb/hcd.c 1.8 -> 1.9
# Documentation/Configure.help 1.125 -> 1.126
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/17 [EMAIL PROTECTED] 1.803
# Created configuration option for CONFIG_USB_HARDENING and updated
# hcd.c to use it rather than CONFIG_USB_DEBUG because it actually
# changes code execution rather than just put extra messages to the
# syslog.
# --------------------------------------------
#
diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help
--- a/Documentation/Configure.help Thu Oct 17 12:05:03 2002
+++ b/Documentation/Configure.help Thu Oct 17 12:05:03 2002
@@ -13592,6 +13592,14 @@
of debug messages to the system log. Select this if you are having a
problem with USB support and want to see more of what is going on.
+USB extra hardening code
+CONFIG_USB_HARDENING
+ Say Y here if you want the USB core & hub drivers to make additional
+ settings and run additional code paths. The point of this is to
+ exercise code paths that may not normally be exercised. Unless you
+ are developing in the USB core, hub, or host controller code you can
+ safely leave this set to N.
+
USB long timeout for slow-responding devices (some MGE Ellipse UPSes)
CONFIG_USB_LONG_TIMEOUT
This option makes the standard time out a bit longer. Basically,
diff -Nru a/drivers/usb/Config.in b/drivers/usb/Config.in
--- a/drivers/usb/Config.in Thu Oct 17 12:05:03 2002
+++ b/drivers/usb/Config.in Thu Oct 17 12:05:03 2002
@@ -7,6 +7,7 @@
dep_tristate 'Support for USB' CONFIG_USB $CONFIG_PCI
if [ "$CONFIG_USB" = "y" -o "$CONFIG_USB" = "m" ]; then
bool ' USB verbose debug messages' CONFIG_USB_DEBUG
+ bool ' USB extra hardening code' CONFIG_USB_HARDENING
comment 'Miscellaneous USB options'
bool ' Preliminary USB device filesystem' CONFIG_USB_DEVICEFS
diff -Nru a/drivers/usb/hcd.c b/drivers/usb/hcd.c
--- a/drivers/usb/hcd.c Thu Oct 17 12:05:03 2002
+++ b/drivers/usb/hcd.c Thu Oct 17 12:05:03 2002
@@ -35,12 +35,6 @@
#include <linux/uts.h> /* for UTS_SYSNAME */
-#ifdef CONFIG_USB_DEBUG
- #define DEBUG
-#else
- #undef DEBUG
-#endif
-
#include <linux/usb.h>
#include "hcd.h"
@@ -1074,7 +1068,7 @@
return -EINVAL;
}
-#ifdef DEBUG
+#ifdef CONFIG_USB_HARDENING
/* stuff that drivers shouldn't do, but which shouldn't
* cause problems in HCDs if they get it wrong.
*/
--
(__) Doug Alcorn - Unix/Linux/Web Developing
oo / PGP 02B3 1E26 BCF2 9AAF 93F1 61D7 450C B264 3E63 D543
|_/ mailto:doug@;lathi.net http://www.lathi.net
-------------------------------------------------------
This sf.net email is sponsored by: viaVerio will pay you up to
$1,000 for every account that you consolidate with us.
http://ad.doubleclick.net/clk;4749864;7604308;v?
http://www.viaverio.com/consolidator/osdn.cfm
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
