Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e83726b0460f4741c8f10e1488fbcc0a9e5f0b7e

Authored by Eric Dumazet
Committed by David S. Miller
1 parent 612eef4f47
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

l2tp: small cleanup 

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff

... ... @@ -65,9 +65,7 @@
65 65 continue;
66 66  
67 67 if ((l2tp->conn_id == tunnel_id) &&
68   -#ifdef CONFIG_NET_NS
69   - (sk->sk_net == net) &&
70   -#endif
  68 + net_eq(sock_net(sk), net) &&
71 69 !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&
72 70 !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
73 71 goto found;