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

!12197 net: flow_dissector: use DEBUG_NET_WARN_ON_ONCE 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/74FGYRYAAZK5OTGFMH7MNS2BZ62ZS3VG/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAKPY5 
 
Link:https://gitee.com/openeuler/kernel/pulls/12197

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 4287d7b5 78628346

include/linux/netdevice.h

+6 −0
Original line number Diff line number Diff line
@@ -5346,6 +5346,12 @@ do { \ 
})

#endif



#if defined(CONFIG_DEBUG_NET)

#define DEBUG_NET_WARN_ON_ONCE(cond) (void)WARN_ON_ONCE(cond)

#else

#define DEBUG_NET_WARN_ON_ONCE(cond) BUILD_BUG_ON_INVALID(cond)

#endif



/*

 *	The list of packet types we will receive (as opposed to discard)

 *	and the routines to invoke.

net/core/flow_dissector.c

+1 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ bool __skb_flow_dissect(const struct net *net, 
		}

	}



	WARN_ON_ONCE(!net);

	DEBUG_NET_WARN_ON_ONCE(!net);

	if (net) {

		enum netns_bpf_attach_type type = NETNS_BPF_FLOW_DISSECTOR;

		struct bpf_prog_array *run_array;