Commit 974ceb21 authored Aug 29, 2019 by Denis Efremov Committed by David S. Miller Aug 30, 2019

udp: Remove unlikely() from IS_ERR*() condition

"unlikely(IS_ERR_OR_NULL(x))" is excessive. IS_ERR_OR_NULL() already uses
unlikely() internally.

Signed-off-by: Denis Efremov <efremov@linux.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Joe Perches <joe@perches.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7cf92ccb

include/net/udp.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -480,7 +480,7 @@ static inline struct sk_buff udp_rcv_segment(struct sock sk,
		* CB fragment
		*/
		segs = __skb_gso_segment(skb, features, false);
		if (unlikely(IS_ERR_OR_NULL(segs))) {
		if (IS_ERR_OR_NULL(segs)) {
		int segs_nr = skb_shinfo(skb)->gso_segs;

		atomic_add(segs_nr, &sk->sk_drops);

Admin message