Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c62825e authored by Sasha Levin's avatar Sasha Levin Committed by Greg Kroah-Hartman
Browse files

Revert "scsi: target: iscsi: cxgbit: fix csk leak" 



This reverts commit b8315280.

A wrong commit message was used for the stable commit because of a human
error (and duplicate commit subject lines).

This patch reverts this error, and the following patches add the two
upstream commits.

Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d93cef31

drivers/target/iscsi/cxgbit/cxgbit_cm.c

+1 −4
Original line number Diff line number Diff line
@@ -631,11 +631,8 @@ static void cxgbit_send_halfclose(struct cxgbit_sock *csk) 


static void cxgbit_arp_failure_discard(void *handle, struct sk_buff *skb)

{

	struct cxgbit_sock *csk = handle;



	pr_debug("%s cxgbit_device %p\n", __func__, handle);

	kfree_skb(skb);

	cxgbit_put_csk(csk);

}



static void cxgbit_abort_arp_failure(void *handle, struct sk_buff *skb)
@@ -1150,7 +1147,7 @@ cxgbit_pass_accept_rpl(struct cxgbit_sock *csk, struct cpl_pass_accept_req *req) 
	rpl5->opt0 = cpu_to_be64(opt0);

	rpl5->opt2 = cpu_to_be32(opt2);

	set_wr_txq(skb, CPL_PRIORITY_SETUP, csk->ctrlq_idx);

	t4_set_arp_err_handler(skb, csk, cxgbit_arp_failure_discard);

	t4_set_arp_err_handler(skb, NULL, cxgbit_arp_failure_discard);

	cxgbit_l2t_send(csk->com.cdev, skb, csk->l2t);

}