From 818dc5e72af8a3eb772997188e2bd8ea616de844 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Sat, 15 Feb 2014 00:06:09 +0100
Subject: [PATCH] sd-rtnl: always include linux/rtnetlink.h

---
 src/core/loopback-setup.c             | 1 -
 src/libsystemd/sd-rtnl/rtnl-message.c | 3 ++-
 src/libsystemd/sd-rtnl/rtnl-util.c    | 1 -
 src/libsystemd/sd-rtnl/test-rtnl.c    | 1 -
 src/network/networkd.h                | 1 -
 src/nspawn/nspawn.c                   | 1 -
 src/systemd/sd-rtnl.h                 | 8 ++------
 7 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c
index a53855fdc..8a5b8121b 100644
--- a/src/core/loopback-setup.c
+++ b/src/core/loopback-setup.c
@@ -24,7 +24,6 @@
 #include <net/if.h>
 #include <asm/types.h>
 #include <netinet/in.h>
-#include <linux/rtnetlink.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c
index 096a32236..15e3247ac 100644
--- a/src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/src/libsystemd/sd-rtnl/rtnl-message.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/rtnetlink.h>
 #include <netinet/in.h>
 #include <netinet/ether.h>
 #include <stdbool.h>
@@ -232,6 +231,8 @@ int sd_rtnl_message_new_addr(uint16_t nlmsg_type, int index, unsigned char famil
 
         (*ret)->hdr->nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
         (*ret)->hdr->nlmsg_type = nlmsg_type;
+        if (nlmsg_type == RTM_GETADDR && family == AF_INET)
+                (*ret)->hdr->nlmsg_flags |= NLM_F_DUMP;
 
         ifa = NLMSG_DATA((*ret)->hdr);
 
diff --git a/src/libsystemd/sd-rtnl/rtnl-util.c b/src/libsystemd/sd-rtnl/rtnl-util.c
index caa21d60f..6545ad0c5 100644
--- a/src/libsystemd/sd-rtnl/rtnl-util.c
+++ b/src/libsystemd/sd-rtnl/rtnl-util.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/rtnetlink.h>
 #include <netinet/ether.h>
 
 #include "sd-rtnl.h"
diff --git a/src/libsystemd/sd-rtnl/test-rtnl.c b/src/libsystemd/sd-rtnl/test-rtnl.c
index 53efed561..21e12f65e 100644
--- a/src/libsystemd/sd-rtnl/test-rtnl.c
+++ b/src/libsystemd/sd-rtnl/test-rtnl.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/rtnetlink.h>
 #include <netinet/ether.h>
 
 #include "util.h"
diff --git a/src/network/networkd.h b/src/network/networkd.h
index 726cd8369..51d77570d 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <arpa/inet.h>
-#include <linux/rtnetlink.h>
 
 #include "sd-event.h"
 #include "sd-rtnl.h"
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index fcc0f17ae..a81bb8ea4 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -40,7 +40,6 @@
 #include <sys/un.h>
 #include <sys/socket.h>
 #include <linux/netlink.h>
-#include <linux/rtnetlink.h>
 #include <sys/eventfd.h>
 #include <net/if.h>
 #include <linux/veth.h>
diff --git a/src/systemd/sd-rtnl.h b/src/systemd/sd-rtnl.h
index 5506bfa4f..321f42af0 100644
--- a/src/systemd/sd-rtnl.h
+++ b/src/systemd/sd-rtnl.h
@@ -25,6 +25,7 @@
 #include <inttypes.h>
 #include <netinet/in.h>
 #include <netinet/ether.h>
+#include <linux/rtnetlink.h>
 
 #include "sd-event.h"
 #include "_sd-common.h"
@@ -71,12 +72,7 @@ int sd_rtnl_message_new_addr(uint16_t msg_type, int index, unsigned char family,
                              sd_rtnl_message **ret);
 int sd_rtnl_message_new_route(uint16_t nlmsg_type, unsigned char rtm_family,
                               sd_rtnl_message **ret);
-/*
-                              unsigned char rtm_dst_len, unsigned char rtm_src_len,
-                              unsigned char rtm_tos, unsigned char rtm_table,
-                              unsigned char rtm_scope, unsigned char rtm_protocol,
-                              unsigned char rtm_type, unsigned flags, sd_rtnl_message **ret);
-*/
+
 sd_rtnl_message *sd_rtnl_message_ref(sd_rtnl_message *m);
 sd_rtnl_message *sd_rtnl_message_unref(sd_rtnl_message *m);
 
-- 
2.30.2