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
Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
scsi
/
cxgb3i
/
cxgb3i_init.c
diff --git
a/drivers/scsi/cxgb3i/cxgb3i_init.c
b/drivers/scsi/cxgb3i/cxgb3i_init.c
index
042d9bc
..
d0ab23a
100644
(file)
--- a/
drivers/scsi/cxgb3i/cxgb3i_init.c
+++ b/
drivers/scsi/cxgb3i/cxgb3i_init.c
@@
-26,7
+26,7
@@
MODULE_VERSION(DRV_MODULE_VERSION);
static void open_s3_dev(struct t3cdev *);
static void close_s3_dev(struct t3cdev *);
static void open_s3_dev(struct t3cdev *);
static void close_s3_dev(struct t3cdev *);
-static void s3_e
rr_handler(struct t3cdev *tdev, u32 status, u32 error
);
+static void s3_e
vent_handler(struct t3cdev *tdev, u32 event, u32 port
);
static cxgb3_cpl_handler_func cxgb3i_cpl_handlers[NUM_CPL_CMDS];
static struct cxgb3_client t3c_client = {
static cxgb3_cpl_handler_func cxgb3i_cpl_handlers[NUM_CPL_CMDS];
static struct cxgb3_client t3c_client = {
@@
-34,7
+34,7
@@
static struct cxgb3_client t3c_client = {
.handlers = cxgb3i_cpl_handlers,
.add = open_s3_dev,
.remove = close_s3_dev,
.handlers = cxgb3i_cpl_handlers,
.add = open_s3_dev,
.remove = close_s3_dev,
- .e
rr_handler = s3_err
_handler,
+ .e
vent_handler = s3_event
_handler,
};
/**
};
/**
@@
-66,16
+66,16
@@
static void close_s3_dev(struct t3cdev *t3dev)
cxgb3i_ddp_cleanup(t3dev);
}
cxgb3i_ddp_cleanup(t3dev);
}
-static void s3_e
rr_handler(struct t3cdev *tdev, u32 status, u32 error
)
+static void s3_e
vent_handler(struct t3cdev *tdev, u32 event, u32 port
)
{
struct cxgb3i_adapter *snic = cxgb3i_adapter_find_by_tdev(tdev);
{
struct cxgb3i_adapter *snic = cxgb3i_adapter_find_by_tdev(tdev);
- cxgb3i_log_info("snic 0x%p, tdev 0x%p,
status 0x%x, err
0x%x.\n",
- snic, tdev,
status, error
);
+ cxgb3i_log_info("snic 0x%p, tdev 0x%p,
event 0x%x, port
0x%x.\n",
+ snic, tdev,
event, port
);
if (!snic)
return;
if (!snic)
return;
- switch (
status
) {
+ switch (
event
) {
case OFFLOAD_STATUS_DOWN:
snic->flags |= CXGB3I_ADAPTER_FLAG_RESET;
break;
case OFFLOAD_STATUS_DOWN:
snic->flags |= CXGB3I_ADAPTER_FLAG_RESET;
break;