Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 986f7cbc authored Jan 06, 2017 by Guillaume Nault Committed by David S. Miller Jan 06, 2017

l2tp: remove useless NULL check in __l2tp_ip*_bind_lookup()



If "l2tp" was NULL, that'd mean "sk" is NULL too. This can't happen
since "sk" is returned by sk_for_each_bound().

Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent bb39b0bd

net/l2tp/l2tp_ip.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -56,9 +56,6 @@ static struct sock __l2tp_ip_bind_lookup(const struct net net, __be32 laddr,
		const struct l2tp_ip_sock *l2tp = l2tp_ip_sk(sk);
		const struct inet_sock *inet = inet_sk(sk);

		if (l2tp == NULL)
		continue;

		if ((l2tp->conn_id == tunnel_id) &&
		net_eq(sock_net(sk), net) &&
		!(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&

net/l2tp/l2tp_ip6.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -69,9 +69,6 @@ static struct sock __l2tp_ip6_bind_lookup(const struct net net,
		const struct in6_addr *sk_raddr = &sk->sk_v6_daddr;
		const struct l2tp_ip6_sock *l2tp = l2tp_ip6_sk(sk);

		if (l2tp == NULL)
		continue;

		if ((l2tp->conn_id == tunnel_id) &&
		net_eq(sock_net(sk), net) &&
		(!sk_laddr \|\| ipv6_addr_any(sk_laddr) \|\| ipv6_addr_equal(sk_laddr, laddr)) &&