William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 1 | From 2069f0b0d5ab8f869aeba635a347e0b11d362b30 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 26 Oct 2017 22:10:42 -0700 |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 4 | Subject: [PATCH] Include netinet/if_ether.h |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 5 | |
| 6 | Fixes |
| 7 | /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' |
| 8 | struct ethhdr { |
| 9 | ^~~~~~ |
| 10 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 11 | and related arphdr, arpreq, and arpreq_old errors |
| 12 | /path/to/systemd/recipe-sysroot/usr/include/net/if_arp.h:22:8: error: redefinition of 'struct arphdr' |
| 13 | struct arphdr { |
| 14 | ^~~~~~ |
| 15 | |
| 16 | The latter requires removing some includes of net/if_arp.h to avoid |
| 17 | conflicting with netinet/if_ether.h. |
| 18 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 19 | Upstream-Status: Inappropriate [musl specific] |
| 20 | |
| 21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 22 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 23 | [rebased for systemd 243] |
| 24 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 25 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 26 | Upstream-Status: Inappropriate [musl specific] |
| 27 | |
| 28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 29 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 30 | [rebased for systemd 243] |
| 31 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 32 | [rebased for systemd 247] |
| 33 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 34 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 35 | --- |
| 36 | src/libsystemd-network/sd-dhcp6-client.c | 1 - |
| 37 | src/libsystemd/sd-netlink/netlink-types.c | 1 + |
| 38 | src/machine/machine-dbus.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 39 | src/network/netdev/bond.c | 1 + |
| 40 | src/network/netdev/bridge.c | 1 + |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 41 | src/network/netdev/macsec.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 42 | src/network/netdev/netdev-gperf.gperf | 1 + |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 43 | src/network/netdev/netdev.c | 1 + |
| 44 | src/network/networkd-brvlan.c | 1 + |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 45 | src/network/networkd-dhcp-common.c | 4 +++- |
| 46 | src/network/networkd-dhcp-server.c | 4 ++-- |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 47 | src/network/networkd-dhcp4.c | 2 +- |
| 48 | src/network/networkd-dhcp6.c | 2 +- |
| 49 | src/network/networkd-link.c | 2 +- |
| 50 | src/network/networkd-network.c | 1 + |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 51 | src/network/networkd-route.c | 5 ++++- |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 52 | src/network/test-network-tables.c | 1 + |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 53 | src/shared/ethtool-util.c | 1 + |
| 54 | src/shared/ethtool-util.h | 1 + |
| 55 | src/udev/net/link-config.c | 1 + |
| 56 | src/udev/udev-builtin-net_setup_link.c | 1 + |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 57 | 21 files changed, 26 insertions(+), 8 deletions(-) |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 58 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 59 | --- a/src/libsystemd-network/sd-dhcp6-client.c |
| 60 | +++ b/src/libsystemd-network/sd-dhcp6-client.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 61 | @@ -5,7 +5,6 @@ |
| 62 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 63 | #include <errno.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 64 | #include <sys/ioctl.h> |
| 65 | -#include <linux/if_arp.h> |
| 66 | #include <linux/if_infiniband.h> |
| 67 | |
| 68 | #include "sd-dhcp6-client.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 69 | --- a/src/libsystemd/sd-netlink/netlink-types.c |
| 70 | +++ b/src/libsystemd/sd-netlink/netlink-types.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 71 | @@ -3,6 +3,7 @@ |
| 72 | #include <netinet/in.h> |
| 73 | #include <stdint.h> |
| 74 | #include <sys/socket.h> |
| 75 | +#include <netinet/if_ether.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 76 | #include <linux/can/vxcan.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 77 | #include <linux/netlink.h> |
| 78 | #include <linux/rtnetlink.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 79 | --- a/src/machine/machine-dbus.c |
| 80 | +++ b/src/machine/machine-dbus.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 81 | @@ -3,6 +3,7 @@ |
| 82 | #include <errno.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 83 | #include <sys/mount.h> |
| 84 | #include <sys/wait.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 85 | +#include <netinet/if_ether.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 86 | |
| 87 | /* When we include libgen.h because we need dirname() we immediately |
| 88 | * undefine basename() since libgen.h defines it as a macro to the POSIX |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 89 | --- a/src/network/netdev/bond.c |
| 90 | +++ b/src/network/netdev/bond.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 91 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 92 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 93 | |
| 94 | +#include <netinet/if_ether.h> |
| 95 | #include "alloc-util.h" |
| 96 | #include "bond.h" |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 97 | #include "bond-util.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 98 | --- a/src/network/netdev/bridge.c |
| 99 | +++ b/src/network/netdev/bridge.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 100 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 101 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 102 | |
| 103 | +#include <netinet/if_ether.h> |
| 104 | #include <net/if.h> |
| 105 | |
| 106 | #include "bridge.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 107 | --- a/src/network/netdev/macsec.c |
| 108 | +++ b/src/network/netdev/macsec.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 109 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 110 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 111 | |
| 112 | +#include <netinet/if_ether.h> |
| 113 | #include <netinet/in.h> |
| 114 | #include <linux/if_ether.h> |
| 115 | #include <linux/if_macsec.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 116 | --- a/src/network/netdev/netdev-gperf.gperf |
| 117 | +++ b/src/network/netdev/netdev-gperf.gperf |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 118 | @@ -3,6 +3,7 @@ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 119 | #if __GNUC__ >= 7 |
| 120 | _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") |
| 121 | #endif |
| 122 | +#include <netinet/if_ether.h> |
| 123 | #include <stddef.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 124 | #include "bareudp.h" |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 125 | #include "batadv.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 126 | --- a/src/network/netdev/netdev.c |
| 127 | +++ b/src/network/netdev/netdev.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 128 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 129 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 130 | |
| 131 | +#include <netinet/if_ether.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 132 | #include <net/if.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 133 | #include <netinet/in.h> |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 134 | #include <unistd.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 135 | --- a/src/network/networkd-dhcp-common.c |
| 136 | +++ b/src/network/networkd-dhcp-common.c |
| 137 | @@ -1,7 +1,8 @@ |
| 138 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 139 | |
| 140 | #include <netinet/in.h> |
| 141 | -#include <linux/if_arp.h> |
| 142 | +#include <net/if_arp.h> |
| 143 | +#include <net/if.h> |
| 144 | |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 145 | #include "bus-error.h" |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame^] | 146 | #include "dhcp-identifier.h" |
| 147 | @@ -13,6 +14,7 @@ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 148 | #include "networkd-dhcp-common.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 149 | #include "networkd-link.h" |
| 150 | #include "networkd-manager.h" |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 151 | +#include <netinet/if_ether.h> |
| 152 | #include "networkd-network.h" |
| 153 | #include "parse-util.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 154 | #include "socket-util.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 155 | --- a/src/network/networkd-dhcp-server.c |
| 156 | +++ b/src/network/networkd-dhcp-server.c |
| 157 | @@ -1,8 +1,8 @@ |
| 158 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 159 | |
| 160 | #include <netinet/in.h> |
| 161 | -#include <linux/if_arp.h> |
| 162 | -#include <linux/if.h> |
| 163 | +#include <net/if_arp.h> |
| 164 | +#include <net/if.h> |
| 165 | |
| 166 | #include "sd-dhcp-server.h" |
| 167 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 168 | --- a/src/network/networkd-dhcp4.c |
| 169 | +++ b/src/network/networkd-dhcp4.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 170 | @@ -1,9 +1,9 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 171 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 172 | |
| 173 | +#include <netinet/if_ether.h> |
| 174 | #include <netinet/in.h> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 175 | #include <netinet/ip.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 176 | #include <linux/if.h> |
| 177 | -#include <linux/if_arp.h> |
| 178 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 179 | #include "escape.h" |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 180 | #include "alloc-util.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 181 | --- a/src/network/networkd-dhcp6.c |
| 182 | +++ b/src/network/networkd-dhcp6.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 183 | @@ -3,9 +3,9 @@ |
| 184 | Copyright © 2014 Intel Corporation. All rights reserved. |
| 185 | ***/ |
| 186 | |
| 187 | +#include <netinet/if_ether.h> |
| 188 | #include <netinet/in.h> |
| 189 | #include <linux/if.h> |
| 190 | -#include <linux/if_arp.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 191 | |
| 192 | #include "sd-dhcp6-client.h" |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 193 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 194 | --- a/src/network/networkd-link.c |
| 195 | +++ b/src/network/networkd-link.c |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame^] | 196 | @@ -1,9 +1,10 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 197 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 198 | |
| 199 | +#include <netinet/if_ether.h> |
| 200 | #include <netinet/in.h> |
| 201 | #include <linux/if.h> |
| 202 | -#include <linux/if_arp.h> |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 203 | #include <linux/if_link.h> |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame^] | 204 | +#include <linux/netdevice.h> |
| 205 | #include <sys/socket.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 206 | #include <unistd.h> |
| 207 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 208 | --- a/src/network/networkd-network.c |
| 209 | +++ b/src/network/networkd-network.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 210 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 211 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 212 | |
| 213 | +#include <netinet/if_ether.h> |
| 214 | #include <net/if.h> |
| 215 | #include <netinet/in.h> |
| 216 | #include <linux/netdevice.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 217 | --- a/src/network/test-network-tables.c |
| 218 | +++ b/src/network/test-network-tables.c |
| 219 | @@ -1,5 +1,6 @@ |
| 220 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 221 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 222 | +#include <netinet/if_ether.h> |
| 223 | #include "bond.h" |
| 224 | #include "dhcp6-internal.h" |
| 225 | #include "dhcp6-protocol.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 226 | --- a/src/shared/ethtool-util.c |
| 227 | +++ b/src/shared/ethtool-util.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 228 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 229 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 230 | |
| 231 | +#include <netinet/if_ether.h> |
| 232 | #include <net/if.h> |
| 233 | #include <sys/ioctl.h> |
| 234 | #include <linux/ethtool.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 235 | --- a/src/shared/ethtool-util.h |
| 236 | +++ b/src/shared/ethtool-util.h |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 237 | @@ -3,6 +3,7 @@ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 238 | |
| 239 | #include <macro.h> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 240 | #include <net/ethernet.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 241 | +#include <netinet/if_ether.h> |
| 242 | #include <linux/ethtool.h> |
| 243 | |
| 244 | #include "conf-parser.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 245 | --- a/src/udev/net/link-config.c |
| 246 | +++ b/src/udev/net/link-config.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 247 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 248 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 249 | |
| 250 | +#include <netinet/if_ether.h> |
| 251 | #include <linux/netdevice.h> |
| 252 | #include <netinet/ether.h> |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 253 | #include <unistd.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 254 | --- a/src/udev/udev-builtin-net_setup_link.c |
| 255 | +++ b/src/udev/udev-builtin-net_setup_link.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 256 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 257 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 258 | |
| 259 | +#include <netinet/if_ether.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 260 | #include "alloc-util.h" |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 261 | #include "device-util.h" |
| 262 | #include "errno-util.h" |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame^] | 263 | --- a/src/network/networkd-bridge-vlan.c |
| 264 | +++ b/src/network/networkd-bridge-vlan.c |
| 265 | @@ -4,6 +4,7 @@ |
| 266 | ***/ |
| 267 | |
| 268 | #include <netinet/in.h> |
| 269 | +#include <netinet/if_ether.h> |
| 270 | #include <linux/if_bridge.h> |
| 271 | #include <stdbool.h> |
| 272 | |
| 273 | --- a/src/basic/linux/in6.h |
| 274 | +++ b/src/basic/linux/in6.h |
| 275 | @@ -1,10 +1,10 @@ |
| 276 | /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ |
| 277 | /* |
| 278 | - * Types and definitions for AF_INET6 |
| 279 | - * Linux INET6 implementation |
| 280 | + * Types and definitions for AF_INET6 |
| 281 | + * Linux INET6 implementation |
| 282 | * |
| 283 | * Authors: |
| 284 | - * Pedro Roque <roque@di.fc.ul.pt> |
| 285 | + * Pedro Roque <roque@di.fc.ul.pt> |
| 286 | * |
| 287 | * Sources: |
| 288 | * IPv6 Program Interfaces for BSD Systems |
| 289 | @@ -19,8 +19,8 @@ |
| 290 | * 2 of the License, or (at your option) any later version. |
| 291 | */ |
| 292 | |
| 293 | -#ifndef _UAPI_LINUX_IN6_H |
| 294 | -#define _UAPI_LINUX_IN6_H |
| 295 | +#ifndef _LINUX_IN6_H |
| 296 | +#define _LINUX_IN6_H |
| 297 | |
| 298 | #include <linux/types.h> |
| 299 | #include <linux/libc-compat.h> |
| 300 | @@ -97,7 +97,7 @@ struct in6_flowlabel_req { |
| 301 | |
| 302 | |
| 303 | /* |
| 304 | - * Bitmask constant declarations to help applications select out the |
| 305 | + * Bitmask constant declarations to help applications select out the |
| 306 | * flow label and priority fields. |
| 307 | * |
| 308 | * Note that this are in host byte order while the flowinfo field of |
| 309 | @@ -298,4 +298,4 @@ struct in6_flowlabel_req { |
| 310 | * ... |
| 311 | * MRT6_MAX |
| 312 | */ |
| 313 | -#endif /* _UAPI_LINUX_IN6_H */ |
| 314 | +#endif /* _LINUX_IN6_H */ |
| 315 | --- a/src/network/networkd-route.c |
| 316 | +++ b/src/network/networkd-route.c |
| 317 | @@ -1,5 +1,6 @@ |
| 318 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 319 | |
| 320 | +#include <netinet/in.h> |
| 321 | #include <linux/icmpv6.h> |
| 322 | #include <linux/ipv6_route.h> |
| 323 | #include <linux/nexthop.h> |
| 324 | --- a/src/network/networkd-setlink.c |
| 325 | +++ b/src/network/networkd-setlink.c |
| 326 | @@ -1,8 +1,8 @@ |
| 327 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 328 | |
| 329 | #include <netinet/in.h> |
| 330 | +#include <net/if_arp.h> |
| 331 | #include <linux/if.h> |
| 332 | -#include <linux/if_arp.h> |
| 333 | |
| 334 | #include "missing_network.h" |
| 335 | #include "netlink-util.h" |