megaraid: fix BUG_ON() from incorrect use of delayed work

[pandora-kernel.git] / drivers / scsi / megaraid / megaraid_sas.h

diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index e8f8926..3b2365c 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -1,7 +1,7 @@
 /*
  *  Linux MegaRAID driver for SAS based RAID controllers
  *
- *  Copyright (c) 2009-2011  LSI Corporation.
+ *  Copyright (c) 2003-2012  LSI Corporation.
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -33,9 +33,9 @@
 /*
  * MegaRAID SAS Driver meta data
  */
-#define MEGASAS_VERSION                                "00.00.06.15-rc1"
-#define MEGASAS_RELDATE                                "Mar. 19, 2012"
-#define MEGASAS_EXT_VERSION                    "Mon. Mar. 19 17:00:00 PDT 2012"
+#define MEGASAS_VERSION                                "06.504.01.00-rc1"
+#define MEGASAS_RELDATE                                "Oct. 1, 2012"
+#define MEGASAS_EXT_VERSION                    "Mon. Oct. 1 17:00:00 PDT 2012"
 
 /*
  * Device IDs
@@ -747,6 +747,7 @@ struct megasas_ctrl_info {
 #define        MEGASAS_RESET_NOTICE_INTERVAL           5
 #define MEGASAS_IOCTL_CMD                      0
 #define MEGASAS_DEFAULT_CMD_TIMEOUT            90
+#define MEGASAS_THROTTLE_QUEUE_DEPTH           16
 
 /*
  * FW reports the maximum of number of commands that it can accept (maximum
@@ -1275,7 +1276,7 @@ struct megasas_evt_detail {
 } __attribute__ ((packed));
 
 struct megasas_aen_event {
-       struct work_struct hotplug_work;
+       struct delayed_work hotplug_work;
        struct megasas_instance *instance;
 };
 
@@ -1364,6 +1365,7 @@ struct megasas_instance {
        unsigned long bar;
        long reset_flags;
        struct mutex reset_mutex;
+       int throttlequeuedepth;
 };
 
 enum {