Unverified Commit 7f492faa authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10005 seg6: fix parameter passing when calling NF_HOOK() in End.DX4 and End.DX6 behaviors 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/O3ELWW6KF36ZJAFQHHNP5RDE2DIN3UNE/ 
 
https://gitee.com/src-openeuler/kernel/issues/IACZYG 
 
Link:https://gitee.com/openeuler/kernel/pulls/10005

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents e027f52d b022e62d

net/ipv6/seg6_local.c

+4 −4
Original line number Diff line number Diff line
@@ -941,8 +941,8 @@ static int input_action_end_dx6(struct sk_buff *skb, 


	if (static_branch_unlikely(&nf_hooks_lwtunnel_enabled))

		return NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING,

			       dev_net(skb->dev), NULL, skb, NULL,

			       skb_dst(skb)->dev, input_action_end_dx6_finish);

			       dev_net(skb->dev), NULL, skb, skb->dev,

			       NULL, input_action_end_dx6_finish);



	return input_action_end_dx6_finish(dev_net(skb->dev), NULL, skb);

drop:
@@ -991,8 +991,8 @@ static int input_action_end_dx4(struct sk_buff *skb, 


	if (static_branch_unlikely(&nf_hooks_lwtunnel_enabled))

		return NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING,

			       dev_net(skb->dev), NULL, skb, NULL,

			       skb_dst(skb)->dev, input_action_end_dx4_finish);

			       dev_net(skb->dev), NULL, skb, skb->dev,

			       NULL, input_action_end_dx4_finish);



	return input_action_end_dx4_finish(dev_net(skb->dev), NULL, skb);

drop: