Unverified Commit 31515e09 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12596 scsi: fnic: Move flush_work initialization out of if block 

Merge Pull Request from: @ci-robot 
 
PR sync from: GONG Ruiqi <gongruiqi1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PVHWJLDGZDGNBL3FKMF57EI5B5W47ECY/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRJ6 
 
Link:https://gitee.com/openeuler/kernel/pulls/12596

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 2d902497 dda65fa4

drivers/scsi/fnic/fnic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,6 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		spin_lock_init(&fnic->vlans_lock);

		INIT_WORK(&fnic->fip_frame_work, fnic_handle_fip_frame);

		INIT_WORK(&fnic->event_work, fnic_handle_event);

		INIT_WORK(&fnic->flush_work, fnic_flush_tx);

		skb_queue_head_init(&fnic->fip_frame_queue);

		INIT_LIST_HEAD(&fnic->evlist);

		INIT_LIST_HEAD(&fnic->vlans);
@@ -877,6 +876,7 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	INIT_WORK(&fnic->link_work, fnic_handle_link);

	INIT_WORK(&fnic->frame_work, fnic_handle_frame);

	INIT_WORK(&fnic->flush_work, fnic_flush_tx);

	skb_queue_head_init(&fnic->frame_queue);

	skb_queue_head_init(&fnic->tx_queue);