]> git.baikalelectronics.ru Git - kernel.git/commitdiff
udp: Remove unlikely() from IS_ERR*() condition
authorDenis Efremov <efremov@linux.com>
Thu, 29 Aug 2019 16:50:24 +0000 (19:50 +0300)
committerDavid S. Miller <davem@davemloft.net>
Sat, 31 Aug 2019 02:49:37 +0000 (19:49 -0700)
"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>
include/net/udp.h

index 79d141d2103b5bb2d058b3ac67685474e9c19ab9..bad74f7808311e7f4970f949efe67fd30514a2eb 100644 (file)
@@ -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);