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

!15403 ipmr: do not call mr_mfc_uses_dev() for unres entries 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/7NL2II6URGOFVOVSWT6NUEXD57XMSNTL/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBPBJT 
 
Link:https://gitee.com/openeuler/kernel/pulls/15403

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 25ebac57 b2507ef0

net/ipv4/ipmr_base.c

+0 −3
Original line number Diff line number Diff line
@@ -320,9 +320,6 @@ int mr_table_dump(struct mr_table *mrt, struct sk_buff *skb, 
	list_for_each_entry(mfc, &mrt->mfc_unres_queue, list) {

		if (e < s_e)

			goto next_entry2;

		if (filter->dev &&

		    !mr_mfc_uses_dev(mrt, mfc, filter->dev))

			goto next_entry2;



		err = fill(mrt, skb, NETLINK_CB(cb->skb).portid,

			   cb->nlh->nlmsg_seq, mfc, RTM_NEWROUTE, flags);