Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI updates from James Bottomley: "This is mostly updates of the usual suspects: lpfc, qla2xxx, bnx2fc, qedf, hpsa, hisi_sas, smartpqi, cxlflash, aacraid, csiostor along with a host of minor and miscellaneous changes" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (276 commits) qla2xxx: Fix NVMe entry_type for iocb packet on BE system scsi: qla2xxx: avoid unused-function warning scsi: snic: fix a couple of spelling mistakes/typos scsi: qla2xxx: fix a bunch of typos and spelling mistakes scsi: lpfc: don't double count abort errors scsi: lpfc: spin_lock_irq() is not nestable scsi: hisi_sas: optimise DMA slot memory scsi: ibmvfc: constify dev_pm_ops structures. scsi: ibmvscsi: constify dev_pm_ops structures. scsi: cxlflash: Update debug prints in reset handlers scsi: cxlflash: Update send_tmf() parameters scsi: cxlflash: Avoid double free of character device scsi: Add STARGET_CREATED_REMOVE state to scsi_target_state scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails. scsi: ufs: flush eh_work when eh_work scheduled. scsi: qla2xxx: Protect access to qpair members with qpair->qp_lock scsi: sun_esp: fix device reference leaks scsi: fnic: changing queue command to return result DID_IMM_RETRY when rport is init scsi: fnic: correct speed display and add support for 25,40 and 100G scsi: fnic: added timestamp reporting in fnic debug stats ...
This commit is contained in:
Linus Torvalds
@@ -519,7 +519,7 @@ static void fcoe_interface_cleanup(struct fcoe_interface *fcoe)
|
||||
* @skb: The receive skb
|
||||
* @netdev: The associated net device
|
||||
* @ptype: The packet_type structure which was used to register this handler
|
||||
* @orig_dev: The original net_device the the skb was received on.
|
||||
* @orig_dev: The original net_device the skb was received on.
|
||||
* (in case dev is a bond)
|
||||
*
|
||||
* Returns: 0 for success
|
||||
@@ -542,7 +542,7 @@ static int fcoe_fip_recv(struct sk_buff *skb, struct net_device *netdev,
|
||||
* @skb: The receive skb
|
||||
* @netdev: The associated net device
|
||||
* @ptype: The packet_type structure which was used to register this handler
|
||||
* @orig_dev: The original net_device the the skb was received on.
|
||||
* @orig_dev: The original net_device the skb was received on.
|
||||
* (in case dev is a bond)
|
||||
*
|
||||
* Returns: 0 for success
|
||||
@@ -2258,7 +2258,7 @@ static int _fcoe_create(struct net_device *netdev, enum fip_mode fip_mode,
|
||||
fcoe_interface_cleanup(fcoe);
|
||||
mutex_unlock(&fcoe_config_mutex);
|
||||
fcoe_ctlr_device_delete(ctlr_dev);
|
||||
goto out;
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* Make this the "master" N_Port */
|
||||
@@ -2299,7 +2299,7 @@ static int _fcoe_create(struct net_device *netdev, enum fip_mode fip_mode,
|
||||
out_nodev:
|
||||
rtnl_unlock();
|
||||
mutex_unlock(&fcoe_config_mutex);
|
||||
out:
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -2590,7 +2590,7 @@ module_exit(fcoe_exit);
|
||||
* fcoe_flogi_resp() - FCoE specific FLOGI and FDISC response handler
|
||||
* @seq: active sequence in the FLOGI or FDISC exchange
|
||||
* @fp: response frame, or error encoded in a pointer (timeout)
|
||||
* @arg: pointer the the fcoe_ctlr structure
|
||||
* @arg: pointer to the fcoe_ctlr structure
|
||||
*
|
||||
* This handles MAC address management for FCoE, then passes control on to
|
||||
* the libfc FLOGI response handler.
|
||||
@@ -2619,7 +2619,7 @@ done:
|
||||
* fcoe_logo_resp() - FCoE specific LOGO response handler
|
||||
* @seq: active sequence in the LOGO exchange
|
||||
* @fp: response frame, or error encoded in a pointer (timeout)
|
||||
* @arg: pointer the the fcoe_ctlr structure
|
||||
* @arg: pointer to the fcoe_ctlr structure
|
||||
*
|
||||
* This handles MAC address management for FCoE, then passes control on to
|
||||
* the libfc LOGO response handler.
|
||||
|
||||
مرجع در شماره جدید
Block a user