Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
scsi
/
bnx2fc
/
bnx2fc_els.c
diff --git
a/kernel/drivers/scsi/bnx2fc/bnx2fc_els.c
b/kernel/drivers/scsi/bnx2fc/bnx2fc_els.c
index
ef355c1
..
5beea77
100644
(file)
--- a/
kernel/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/
kernel/drivers/scsi/bnx2fc/bnx2fc_els.c
@@
-1,10
+1,10
@@
/*
/*
- * bnx2fc_els.c: QLogic
NetXtreme II
Linux FCoE offload driver.
+ * bnx2fc_els.c: QLogic Linux FCoE offload driver.
* This file contains helper routines that handle ELS requests
* and responses.
*
* This file contains helper routines that handle ELS requests
* and responses.
*
- * Copyright (c) 2008
-
2013 Broadcom Corporation
- * Copyright (c) 2014
,
QLogic Corporation
+ * Copyright (c) 2008
-
2013 Broadcom Corporation
+ * Copyright (c) 2014
-2015
QLogic Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-689,8
+689,7
@@
static int bnx2fc_initiate_els(struct bnx2fc_rport *tgt, unsigned int op,
rc = -EINVAL;
goto els_err;
}
rc = -EINVAL;
goto els_err;
}
- if (!(test_bit(BNX2FC_FLAG_SESSION_READY, &tgt->flags)) ||
- (test_bit(BNX2FC_FLAG_EXPL_LOGO, &tgt->flags))) {
+ if (!(test_bit(BNX2FC_FLAG_SESSION_READY, &tgt->flags))) {
printk(KERN_ERR PFX "els 0x%x: tgt not ready\n", op);
rc = -EINVAL;
goto els_err;
printk(KERN_ERR PFX "els 0x%x: tgt not ready\n", op);
rc = -EINVAL;
goto els_err;
@@
-707,6
+706,7
@@
static int bnx2fc_initiate_els(struct bnx2fc_rport *tgt, unsigned int op,
els_req->cb_func = cb_func;
cb_arg->io_req = els_req;
els_req->cb_arg = cb_arg;
els_req->cb_func = cb_func;
cb_arg->io_req = els_req;
els_req->cb_arg = cb_arg;
+ els_req->data_xfer_len = data_len;
mp_req = (struct bnx2fc_mp_req *)&(els_req->mp_req);
rc = bnx2fc_init_mp_req(els_req);
mp_req = (struct bnx2fc_mp_req *)&(els_req->mp_req);
rc = bnx2fc_init_mp_req(els_req);