Commit ad8b3c1e authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "Two minor fixes in drivers. Both changing strings (one in a comment,
  one in a module help text) with no code impact"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qla2xxx: Fix description for parameter ql2xenforce_iocb_limit
  scsi: target: iscsi: Fix typo in comment
parents 03e319e5 aa2c24e7
...@@ -42,7 +42,7 @@ MODULE_PARM_DESC(ql2xfulldump_on_mpifail, ...@@ -42,7 +42,7 @@ MODULE_PARM_DESC(ql2xfulldump_on_mpifail,
int ql2xenforce_iocb_limit = 1; int ql2xenforce_iocb_limit = 1;
module_param(ql2xenforce_iocb_limit, int, S_IRUGO | S_IWUSR); module_param(ql2xenforce_iocb_limit, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(ql2xenforce_iocb_limit, MODULE_PARM_DESC(ql2xenforce_iocb_limit,
"Enforce IOCB throttling, to avoid FW congestion. (default: 0)"); "Enforce IOCB throttling, to avoid FW congestion. (default: 1)");
/* /*
* CT6 CTX allocation cache * CT6 CTX allocation cache
......
...@@ -896,7 +896,7 @@ int iscsit_setup_np( ...@@ -896,7 +896,7 @@ int iscsit_setup_np(
else else
len = sizeof(struct sockaddr_in); len = sizeof(struct sockaddr_in);
/* /*
* Set SO_REUSEADDR, and disable Nagel Algorithm with TCP_NODELAY. * Set SO_REUSEADDR, and disable Nagle Algorithm with TCP_NODELAY.
*/ */
if (np->np_network_transport == ISCSI_TCP) if (np->np_network_transport == ISCSI_TCP)
tcp_sock_set_nodelay(sock->sk); tcp_sock_set_nodelay(sock->sk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment