1 |
commit: 0f847be6f00208fc3d9ed5f17a3102644c1986f2 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Mar 16 11:33:13 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 25 18:28:21 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f847be6 |
7 |
|
8 |
net-misc/dhcpcd: remove unused patch |
9 |
|
10 |
.../dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch | 61 ---------------------- |
11 |
1 file changed, 61 deletions(-) |
12 |
|
13 |
diff --git a/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch b/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch |
14 |
deleted file mode 100644 |
15 |
index ae7da3fbd8a..00000000000 |
16 |
--- a/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch |
17 |
+++ /dev/null |
18 |
@@ -1,61 +0,0 @@ |
19 |
-Index: ipv4ll.c |
20 |
-================================================================== |
21 |
---- a/ipv4ll.c |
22 |
-+++ b/ipv4ll.c |
23 |
-@@ -242,31 +242,33 @@ |
24 |
- assert(astate != NULL); |
25 |
- assert(astate->iface != NULL); |
26 |
- ifp = astate->iface; |
27 |
- state = IPV4LL_STATE(ifp); |
28 |
- assert(state != NULL); |
29 |
-- assert(state->addr != NULL); |
30 |
- |
31 |
- fail = 0; |
32 |
- /* RFC 3927 2.2.1, Probe Conflict Detection */ |
33 |
- if (amsg == NULL || |
34 |
- (amsg->sip.s_addr == astate->addr.s_addr || |
35 |
- (amsg->sip.s_addr == 0 && amsg->tip.s_addr == astate->addr.s_addr))) |
36 |
- fail = astate->addr.s_addr; |
37 |
- |
38 |
- /* RFC 3927 2.5, Conflict Defense */ |
39 |
-- if (IN_LINKLOCAL(ntohl(state->addr->addr.s_addr)) && |
40 |
-+ if (state->addr != NULL && |
41 |
-+ IN_LINKLOCAL(ntohl(state->addr->addr.s_addr)) && |
42 |
- amsg && amsg->sip.s_addr == state->addr->addr.s_addr) |
43 |
- fail = state->addr->addr.s_addr; |
44 |
- |
45 |
- if (fail == 0) |
46 |
- return; |
47 |
- |
48 |
- astate->failed.s_addr = fail; |
49 |
- arp_report_conflicted(astate, amsg); |
50 |
- |
51 |
-- if (astate->failed.s_addr == state->addr->addr.s_addr) { |
52 |
-+ if (state->addr != NULL && |
53 |
-+ astate->failed.s_addr == state->addr->addr.s_addr) |
54 |
-+ { |
55 |
- struct timespec now, defend; |
56 |
- |
57 |
- /* RFC 3927 Section 2.5 says a defence should |
58 |
- * broadcast an ARP announcement. |
59 |
- * Because the kernel will also unicast a reply to the |
60 |
-@@ -378,16 +380,18 @@ |
61 |
- astate->conflicted_cb = ipv4ll_conflicted; |
62 |
- astate->free_cb = ipv4ll_arpfree; |
63 |
- |
64 |
- /* Find an existing IPv4LL address and ensure we can work with it. */ |
65 |
- ia = ipv4_iffindlladdr(ifp); |
66 |
-+ |
67 |
- #ifdef IN_IFF_TENTATIVE |
68 |
- if (ia != NULL && ia->addr_flags & IN_IFF_DUPLICATED) { |
69 |
- ipv4_deladdr(ia, 0); |
70 |
- ia = NULL; |
71 |
- } |
72 |
- #endif |
73 |
-+ |
74 |
- if (ia != NULL) { |
75 |
- astate->addr = ia->addr; |
76 |
- #ifdef IN_IFF_TENTATIVE |
77 |
- if (ia->addr_flags & (IN_IFF_TENTATIVE | IN_IFF_DETACHED)) { |
78 |
- logger(ifp->ctx, LOG_INFO, |
79 |
- |