diff options
author | Domen Kožar <domen@dev.si> | 2015-10-24 15:48:37 +0200 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2015-10-24 15:48:37 +0200 |
commit | d85ae6138eb3d246cbf82702c7cfaf7857d45835 (patch) | |
tree | d042fc0946e0e615a6e5ea5dd2496cb533c3f5d2 /pkgs/tools/networking/network-manager/nm-platform.patch | |
parent | 6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80 (diff) | |
parent | ee70a5654d7f399a0a12f99a7b0f2714523be250 (diff) | |
download | nixlib-d85ae6138eb3d246cbf82702c7cfaf7857d45835.tar nixlib-d85ae6138eb3d246cbf82702c7cfaf7857d45835.tar.gz nixlib-d85ae6138eb3d246cbf82702c7cfaf7857d45835.tar.bz2 nixlib-d85ae6138eb3d246cbf82702c7cfaf7857d45835.tar.lz nixlib-d85ae6138eb3d246cbf82702c7cfaf7857d45835.tar.xz nixlib-d85ae6138eb3d246cbf82702c7cfaf7857d45835.tar.zst nixlib-d85ae6138eb3d246cbf82702c7cfaf7857d45835.zip |
Merge pull request #10116 from ikervagyok/nm-1.0.6
network-manager 1.0.2 -> 1.0.6
Diffstat (limited to 'pkgs/tools/networking/network-manager/nm-platform.patch')
-rw-r--r-- | pkgs/tools/networking/network-manager/nm-platform.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/tools/networking/network-manager/nm-platform.patch b/pkgs/tools/networking/network-manager/nm-platform.patch new file mode 100644 index 000000000000..880d1a2e4921 --- /dev/null +++ b/pkgs/tools/networking/network-manager/nm-platform.patch @@ -0,0 +1,17 @@ +diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c +index 8803377..14e5726 100644 +--- a/src/platform/nm-platform.c ++++ b/src/platform/nm-platform.c +@@ -39,6 +39,12 @@ + #include "nm-enum-types.h" + #include "nm-core-internal.h" + ++#if HAVE_LIBNL_INET6_ADDR_GEN_MODE && HAVE_KERNEL_INET6_ADDR_GEN_MODE ++#include <linux/if_link.h> ++#else ++#define IN6_ADDR_GEN_MODE_NONE 1 ++#endif ++ + #define ADDRESS_LIFETIME_PADDING 5 + + G_STATIC_ASSERT (sizeof ( ((NMPlatformLink *) NULL)->addr.data ) == NM_UTILS_HWADDR_LEN_MAX); |