@@ -30,10 +30,15 @@ Assisted-by: Cursor:claude-4.8-opus
3030Signed-off-by: Christian Breunig <christian@breunig.cc>
3131
3232---
33- diff --git i/net/l2tp/l2tp_core.c w/net/l2tp/l2tp_core.c
34- index 9156a937334a..6fd9c1d89533 100644
35- --- i/net/l2tp/l2tp_core.c
36- +++ w/net/l2tp/l2tp_core.c
33+ net/l2tp/l2tp_core.c | 65 +++++++++++++++++++++++-
34+ net/l2tp/l2tp_ip.c | 37 ++++++++++++++
35+ net/l2tp/l2tp_ip6.c | 117 +++++++++++++++++++++++++++++++++++++++++++
36+ 3 files changed, 218 insertions(+), 1 deletion(-)
37+
38+ diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
39+ index fd78928e9be2..0be01b28b7a8 100644
40+ --- a/net/l2tp/l2tp_core.c
41+ +++ b/net/l2tp/l2tp_core.c
3742@@ -55,6 +55,8 @@
3843 #include <net/inet_ecn.h>
3944 #include <net/ip6_route.h>
@@ -43,7 +48,7 @@ index 9156a937334a..6fd9c1d89533 100644
4348
4449 #include <asm/byteorder.h>
4550 #include <linux/atomic.h>
46- @@ -1453 ,6 +1455 ,67 @@ static void l2tp_tunnel_del_work(struct work_struct *work)
51+ @@ -1454 ,6 +1456 ,67 @@ static void l2tp_tunnel_del_work(struct work_struct *work)
4752 * These sockets are freed when the namespace exits using the pernet
4853 * exit hook.
4954 */
@@ -111,7 +116,7 @@ index 9156a937334a..6fd9c1d89533 100644
111116 static int l2tp_tunnel_sock_create(struct net *net,
112117 u32 tunnel_id,
113118 u32 peer_tunnel_id,
114- @@ -1490 ,7 +1553 ,7 @@ static int l2tp_tunnel_sock_create(struct net *net,
119+ @@ -1491 ,7 +1554 ,7 @@ static int l2tp_tunnel_sock_create(struct net *net,
115120 udp_conf.local_udp_port = htons(cfg->local_udp_port);
116121 udp_conf.peer_udp_port = htons(cfg->peer_udp_port);
117122
@@ -120,10 +125,10 @@ index 9156a937334a..6fd9c1d89533 100644
120125 if (err < 0)
121126 goto out;
122127
123- diff --git i /net/l2tp/l2tp_ip.c w /net/l2tp/l2tp_ip.c
124- index 29795d2839e8..d63b00f09421 100644
125- --- i /net/l2tp/l2tp_ip.c
126- +++ w /net/l2tp/l2tp_ip.c
128+ diff --git a /net/l2tp/l2tp_ip.c b /net/l2tp/l2tp_ip.c
129+ index 29795d2839e8..0d904a50b9a3 100644
130+ --- a /net/l2tp/l2tp_ip.c
131+ +++ b /net/l2tp/l2tp_ip.c
127132@@ -24,6 +24,7 @@
128133 #include <net/xfrm.h>
129134 #include <net/net_namespace.h>
@@ -182,10 +187,10 @@ index 29795d2839e8..d63b00f09421 100644
182187 if (rc < 0)
183188 goto out_sk;
184189
185- diff --git i /net/l2tp/l2tp_ip6.c w /net/l2tp/l2tp_ip6.c
186- index ea232f338dcb..610e666c0a58 100644
187- --- i /net/l2tp/l2tp_ip6.c
188- +++ w /net/l2tp/l2tp_ip6.c
190+ diff --git a /net/l2tp/l2tp_ip6.c b /net/l2tp/l2tp_ip6.c
191+ index ea232f338dcb..e4e34db4c37f 100644
192+ --- a /net/l2tp/l2tp_ip6.c
193+ +++ b /net/l2tp/l2tp_ip6.c
189194@@ -28,6 +28,8 @@
190195 #include <net/transp_v6.h>
191196 #include <net/addrconf.h>
@@ -324,3 +329,6 @@ index ea232f338dcb..610e666c0a58 100644
324329 if (rc < 0)
325330 goto out_sk;
326331
332+ - -
333+ 2.39.5
334+
0 commit comments