git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scsi: megaraid_sas: fix macro MEGASAS_IS_LOGICAL to avoid regression
[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
dd94c7d
..
bc72bf0
100644
(file)
--- a/
drivers/scsi/megaraid/megaraid_sas.h
+++ b/
drivers/scsi/megaraid/megaraid_sas.h
@@
-300,6
+300,8
@@
enum MR_EVT_ARGS {
MR_EVT_ARGS_GENERIC,
};
MR_EVT_ARGS_GENERIC,
};
+
+#define SGE_BUFFER_SIZE 4096
/*
* define constants for device list query options
*/
/*
* define constants for device list query options
*/
@@
-1295,7
+1297,6
@@
struct megasas_instance {
u32 *reply_queue;
dma_addr_t reply_queue_h;
u32 *reply_queue;
dma_addr_t reply_queue_h;
- unsigned long base_addr;
struct megasas_register_set __iomem *reg_set;
struct megasas_pd_list pd_list[MEGASAS_MAX_PD];
struct megasas_register_set __iomem *reg_set;
struct megasas_pd_list pd_list[MEGASAS_MAX_PD];
@@
-1401,7
+1402,7
@@
struct megasas_instance_template {
};
#define MEGASAS_IS_LOGICAL(scp) \
};
#define MEGASAS_IS_LOGICAL(scp) \
- (
scp->device->channel < MEGASAS_MAX_PD_CHANNELS) ? 0 : 1
+ (
(scp->device->channel < MEGASAS_MAX_PD_CHANNELS) ? 0 : 1)
#define MEGASAS_DEV_INDEX(inst, scp) \
((scp->device->channel % 2) * MEGASAS_MAX_DEV_PER_CHANNEL) + \
#define MEGASAS_DEV_INDEX(inst, scp) \
((scp->device->channel % 2) * MEGASAS_MAX_DEV_PER_CHANNEL) + \