ipv6: Remove some pointless conditionals before kfree_skb()
Remove some pointless conditionals before kfree_skb(). The semantic match that finds the problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ expression E; @@ - if (E) - kfree_skb(E); + kfree_skb(E); // </smpl> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
1ce85fe402
Коммит
800d55f146
|
@ -218,8 +218,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
|
||||||
if (opt)
|
if (opt)
|
||||||
sock_kfree_s(sk, opt, opt->tot_len);
|
sock_kfree_s(sk, opt, opt->tot_len);
|
||||||
pktopt = xchg(&np->pktoptions, NULL);
|
pktopt = xchg(&np->pktoptions, NULL);
|
||||||
if (pktopt)
|
kfree_skb(pktopt);
|
||||||
kfree_skb(pktopt);
|
|
||||||
|
|
||||||
sk->sk_destruct = inet_sock_destruct;
|
sk->sk_destruct = inet_sock_destruct;
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -533,8 +533,7 @@ static inline void syn_flood_warning(struct sk_buff *skb)
|
||||||
|
|
||||||
static void tcp_v6_reqsk_destructor(struct request_sock *req)
|
static void tcp_v6_reqsk_destructor(struct request_sock *req)
|
||||||
{
|
{
|
||||||
if (inet6_rsk(req)->pktopts)
|
kfree_skb(inet6_rsk(req)->pktopts);
|
||||||
kfree_skb(inet6_rsk(req)->pktopts);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_TCP_MD5SIG
|
#ifdef CONFIG_TCP_MD5SIG
|
||||||
|
@ -1611,8 +1610,7 @@ ipv6_pktoptions:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (opt_skb)
|
kfree_skb(opt_skb);
|
||||||
kfree_skb(opt_skb);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче