summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/storage
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2014-06-28 03:56:17 +0000
committerhselasky <hselasky@FreeBSD.org>2014-06-28 03:56:17 +0000
commit35b126e324b8032aebea9ab6b4daf7c0bf8daed0 (patch)
tree2ebc46d89e79d747fa284f379b1979658216c719 /sys/dev/usb/storage
parent02776baefafae26b2e8b15569fe1868071fb550a (diff)
downloadFreeBSD-src-35b126e324b8032aebea9ab6b4daf7c0bf8daed0.zip
FreeBSD-src-35b126e324b8032aebea9ab6b4daf7c0bf8daed0.tar.gz
Pull in r267961 and r267973 again. Fix for issues reported will follow.
Diffstat (limited to 'sys/dev/usb/storage')
-rw-r--r--sys/dev/usb/storage/umass.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c
index f3a51b3..e169abb 100644
--- a/sys/dev/usb/storage/umass.c
+++ b/sys/dev/usb/storage/umass.c
@@ -167,12 +167,10 @@ static int umass_debug;
static int umass_throttle;
static SYSCTL_NODE(_hw_usb, OID_AUTO, umass, CTLFLAG_RW, 0, "USB umass");
-SYSCTL_INT(_hw_usb_umass, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_umass, OID_AUTO, debug, CTLFLAG_RWTUN,
&umass_debug, 0, "umass debug level");
-TUNABLE_INT("hw.usb.umass.debug", &umass_debug);
-SYSCTL_INT(_hw_usb_umass, OID_AUTO, throttle, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_umass, OID_AUTO, throttle, CTLFLAG_RWTUN,
&umass_throttle, 0, "Forced delay between commands in milliseconds");
-TUNABLE_INT("hw.usb.umass.throttle", &umass_throttle);
#else
#define DIF(...) do { } while (0)
#define DPRINTF(...) do { } while (0)
OpenPOWER on IntegriCloud