gmac get mac form eeprom

hc

2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb

 kernel/net/ipv4/ipcomp.c
..
..
@@ -1,12 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * IP Payload Compression Protocol (IPComp) - RFC3173.
3
4
  *
4
5
  * Copyright (c) 2003 James Morris <jmorris@intercode.com.au>
5
- *
6
- * This program is free software; you can redistribute it and/or modify it
7
- * under the terms of the GNU General Public License as published by the Free
8
- * Software Foundation; either version 2 of the License, or (at your option)
9
- * any later version.
10
6
  *
11
7
  * Todo:
12
8
  *   - Tunable compression parameters.
..
..
@@ -48,9 +44,9 @@
48
44
 		return 0;
49
45
 
50
46
 	if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
51
-		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0);
47
+		ipv4_update_pmtu(skb, net, info, 0, IPPROTO_COMP);
52
48
 	else
53
-		ipv4_redirect(skb, net, 0, 0, IPPROTO_COMP, 0);
49
+		ipv4_redirect(skb, net, 0, IPPROTO_COMP);
54
50
 	xfrm_state_put(x);
55
51
 
56
52
 	return 0;
..
..
@@ -76,6 +72,7 @@
76
72
 	t->props.flags = x->props.flags;
77
73
 	t->props.extra_flags = x->props.extra_flags;
78
74
 	memcpy(&t->mark, &x->mark, sizeof(t->mark));
75
+	t->if_id = x->if_id;
79
76
 
80
77
 	if (xfrm_init_state(t))
81
78
 		goto error;
..
..
@@ -190,8 +187,7 @@
190
187
 {
191
188
 	if (xfrm4_protocol_deregister(&ipcomp4_protocol, IPPROTO_COMP) < 0)
192
189
 		pr_info("%s: can't remove protocol\n", __func__);
193
-	if (xfrm_unregister_type(&ipcomp_type, AF_INET) < 0)
194
-		pr_info("%s: can't remove xfrm type\n", __func__);
190
+	xfrm_unregister_type(&ipcomp_type, AF_INET);
195
191
 }
196
192
 
197
193
 module_init(ipcomp4_init);