cnic: Fix missing ISCSI_KEVENT_IF_DOWN message (59436914) · Commits · 戴 / test

The iSCSI netlink message needs to be sent before the ulp_ops is cleared as it is sent through a function pointer in the ulp_ops. This bug causes iscsid to not get the message when the bnx2i driver is unloaded. Signed-off-by:

Michael Chan <mchan@broadcom.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/broadcom/cnic.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -608,6 +608,10 @@ static int cnic_unregister_device(struct cnic_dev *dev, int ulp_type)
		pr_err("%s: Bad type %d\n", __func__, ulp_type);
		return -EINVAL;
		}

		if (ulp_type == CNIC_ULP_ISCSI)
		cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);

		mutex_lock(&cnic_lock);
		if (rcu_dereference(cp->ulp_ops[ulp_type])) {
		RCU_INIT_POINTER(cp->ulp_ops[ulp_type], NULL);
		@@ -620,9 +624,7 @@ static int cnic_unregister_device(struct cnic_dev *dev, int ulp_type)
		}
		mutex_unlock(&cnic_lock);

		if (ulp_type == CNIC_ULP_ISCSI)
		cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);
		else if (ulp_type == CNIC_ULP_FCOE)
		if (ulp_type == CNIC_ULP_FCOE)
		dev->fcoe_cap = NULL;

		synchronize_rcu();

Admin message