| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From b2cdab746ef64bc25ba0b9cff596ebdddd6e8dc6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 7 Nov 2018 11:30:44 -0800 |
| 4 | Subject: [PATCH] Do not include net/ethernet.h and linux/if_ether.h |
| 5 | |
| 6 | They conflict when used together especially with musl |
| 7 | removing them still keeps it working so it seems they are redundant |
| 8 | |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | |
| 11 | --- |
| 12 | shared/n-acd/src/n-acd.c | 1 - |
| 13 | src/platform/wpan/nm-wpan-utils.h | 2 -- |
| 14 | src/settings/nm-settings-connection.h | 2 -- |
| 15 | 3 files changed, 5 deletions(-) |
| 16 | |
| 17 | diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c |
| 18 | index def56a2..dd4eb78 100644 |
| 19 | --- a/shared/n-acd/src/n-acd.c |
| 20 | +++ b/shared/n-acd/src/n-acd.c |
| 21 | @@ -11,7 +11,6 @@ |
| 22 | #include <inttypes.h> |
| 23 | #include <limits.h> |
| 24 | #include <linux/if_packet.h> |
| 25 | -#include <netinet/if_ether.h> |
| 26 | #include <netinet/in.h> |
| 27 | #include <stdlib.h> |
| 28 | #include <string.h> |
| 29 | diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/platform/wpan/nm-wpan-utils.h |
| 30 | index 1b54ec4..ed39938 100644 |
| 31 | --- a/src/platform/wpan/nm-wpan-utils.h |
| 32 | +++ b/src/platform/wpan/nm-wpan-utils.h |
| 33 | @@ -20,8 +20,6 @@ |
| 34 | #ifndef __WPAN_UTILS_H__ |
| 35 | #define __WPAN_UTILS_H__ |
| 36 | |
| 37 | -#include <net/ethernet.h> |
| 38 | - |
| 39 | #include "nm-dbus-interface.h" |
| 40 | #include "platform/nm-netlink.h" |
| 41 | |
| 42 | diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h |
| 43 | index e796b71..c01fef6 100644 |
| 44 | --- a/src/settings/nm-settings-connection.h |
| 45 | +++ b/src/settings/nm-settings-connection.h |
| 46 | @@ -22,8 +22,6 @@ |
| 47 | #ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__ |
| 48 | #define __NETWORKMANAGER_SETTINGS_CONNECTION_H__ |
| 49 | |
| 50 | -#include <net/ethernet.h> |
| 51 | - |
| 52 | #include "nm-dbus-object.h" |
| 53 | #include "nm-connection.h" |
| 54 | |