| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 3f4b6319701834182304c4079119780f4ae5b49b 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 | shared/n-acd/src/n-acd.c | 1 - |
| 12 | src/platform/wpan/nm-wpan-utils.h | 2 -- |
| 13 | src/settings/nm-settings-connection.h | 2 -- |
| 14 | 3 files changed, 5 deletions(-) |
| 15 | |
| 16 | diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c |
| 17 | index 9164f95..9538e50 100644 |
| 18 | --- a/shared/n-acd/src/n-acd.c |
| 19 | +++ b/shared/n-acd/src/n-acd.c |
| 20 | @@ -23,7 +23,6 @@ |
| 21 | #include <errno.h> |
| 22 | #include <limits.h> |
| 23 | #include <linux/filter.h> |
| 24 | -#include <linux/if_ether.h> |
| 25 | #include <linux/if_packet.h> |
| 26 | #include <net/ethernet.h> |
| 27 | #include <netinet/if_ether.h> |
| 28 | diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/platform/wpan/nm-wpan-utils.h |
| 29 | index f7d0c03..e1c81f5 100644 |
| 30 | --- a/src/platform/wpan/nm-wpan-utils.h |
| 31 | +++ b/src/platform/wpan/nm-wpan-utils.h |
| 32 | @@ -20,8 +20,6 @@ |
| 33 | #ifndef __WPAN_UTILS_H__ |
| 34 | #define __WPAN_UTILS_H__ |
| 35 | |
| 36 | -#include <net/ethernet.h> |
| 37 | - |
| 38 | #include "nm-dbus-interface.h" |
| 39 | #include "platform/nm-netlink.h" |
| 40 | |
| 41 | diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h |
| 42 | index e796b71..c01fef6 100644 |
| 43 | --- a/src/settings/nm-settings-connection.h |
| 44 | +++ b/src/settings/nm-settings-connection.h |
| 45 | @@ -22,8 +22,6 @@ |
| 46 | #ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__ |
| 47 | #define __NETWORKMANAGER_SETTINGS_CONNECTION_H__ |
| 48 | |
| 49 | -#include <net/ethernet.h> |
| 50 | - |
| 51 | #include "nm-dbus-object.h" |
| 52 | #include "nm-connection.h" |
| 53 | |