diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-03-02 21:02:12 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-03-05 11:27:15 +0100 |
| commit | f4354546157256991f691b53cd1eb688fcb9d1cf (patch) | |
| tree | c2fdcbb6244c185d29f03a2f0024af1ee6c27bca | |
| parent | a0662c05a3dae3a652b55deb236db14c8b138135 (diff) | |
| download | NetworkManager-f4354546157256991f691b53cd1eb688fcb9d1cf.tar.gz | |
platform: move "linux/nl802154.h" to "src/linux-headers/"
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | src/core/platform/wpan/nm-wpan-utils.c | 2 | ||||
| -rw-r--r-- | src/linux-headers/nl802154.h (renamed from src/core/platform/linux/nl802154.h) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 50ee93b287..6b0f0db4f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -571,6 +571,9 @@ src_libnm_platform_libnm_platform_la_CPPFLAGS = \ $(NULL) src_libnm_platform_libnm_platform_la_SOURCES = \ + \ + src/linux-headers/nl802154.h \ + \ src/libnm-platform/nm-netlink.c \ src/libnm-platform/nm-netlink.h \ src/libnm-platform/nm-platform-utils.c \ @@ -2381,9 +2384,6 @@ src_core_libNetworkManagerBase_la_LIBADD = \ $(src_core_libNetworkManagerBase_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -EXTRA_DIST += \ - src/core/platform/linux/nl802154.h - ############################################################################### src_core_libNetworkManager_la_CPPFLAGS = $(src_core_cppflags) diff --git a/src/core/platform/wpan/nm-wpan-utils.c b/src/core/platform/wpan/nm-wpan-utils.c index 9fa23793af..19c8a5e01f 100644 --- a/src/core/platform/wpan/nm-wpan-utils.c +++ b/src/core/platform/wpan/nm-wpan-utils.c @@ -10,7 +10,7 @@ #include <linux/if.h> #include "libnm-platform/nm-netlink.h" -#include "platform/linux/nl802154.h" +#include "linux-headers/nl802154.h" #include "libnm-platform/nm-platform-utils.h" #define _NMLOG_PREFIX_NAME "wpan-nl802154" diff --git a/src/core/platform/linux/nl802154.h b/src/linux-headers/nl802154.h index c21bd0791c..c21bd0791c 100644 --- a/src/core/platform/linux/nl802154.h +++ b/src/linux-headers/nl802154.h |