lib: Rename rtnetlink.[ch] files.

The only rtnetlink specific functionality contained in the
rtnetlink module is the use of the NETLINK_ROUTE protocol.  This
can easily be passed in by callers.

In preparation for generalization, this patch renames
rtnetlink.[ch] to netlink-notifier.[ch].  Future patches will
complete the transition.

diff --git a/lib/automake.mk b/lib/automake.mk
index 2f5b5fd..de2b635 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -205,11 +205,11 @@ lib_libopenvswitch_a_SOURCES += \
        lib/netdev-linux.h \
        lib/netdev-vport.c \
        lib/netdev-vport.h \
+       lib/netlink-notifier.c \
+       lib/netlink-notifier.h \
        lib/netlink-protocol.h \
        lib/netlink-socket.c \
        lib/netlink-socket.h \
-       lib/rtnetlink.c \
-       lib/rtnetlink.h \
        lib/rtnetlink-link.c \
        lib/rtnetlink-link.h \
        lib/route-table.c \

diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
index da48c68..88707d8 100644 (file)
--- a/lib/dpif-linux.c
+++ b/lib/dpif-linux.c
@@ -39,6 +39,7 @@
 #include "netdev.h"
 #include "netdev-linux.h"
 #include "netdev-vport.h"
+#include "netlink-notifier.h"
 #include "netlink-socket.h"
 #include "netlink.h"
 #include "odp-util.h"
@@ -46,7 +47,6 @@
 #include "openvswitch/tunnel.h"
 #include "packets.h"
 #include "poll-loop.h"
-#include "rtnetlink.h"
 #include "rtnetlink-link.h"
 #include "shash.h"
 #include "sset.h"

diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
index 838dac6..d924cf3 100644 (file)
--- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.c
@@ -58,12 +58,12 @@
 #include "netdev-provider.h"
 #include "netdev-vport.h"
 #include "netlink.h"
+#include "netlink-notifier.h"
 #include "netlink-socket.h"
 #include "ofpbuf.h"
 #include "openflow/openflow.h"
 #include "packets.h"
 #include "poll-loop.h"
-#include "rtnetlink.h"
 #include "rtnetlink-link.h"
 #include "socket-util.h"
 #include "shash.h"

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index df7c9a5..15bf8bd 100644 (file)
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -35,13 +35,13 @@
 #include "netdev-linux.h"
 #include "netdev-provider.h"
 #include "netlink.h"
+#include "netlink-notifier.h"
 #include "netlink-socket.h"
 #include "ofpbuf.h"
 #include "openvswitch/datapath-protocol.h"
 #include "openvswitch/tunnel.h"
 #include "packets.h"
 #include "route-table.h"
-#include "rtnetlink.h"
 #include "shash.h"
 #include "socket-util.h"
 #include "vlog.h"

diff --git a/lib/rtnetlink.c b/lib/netlink-notifier.c
similarity index 99%
rename from lib/rtnetlink.c
rename to lib/netlink-notifier.c
index b600554..5635cf8 100644 (file)
--- a/lib/rtnetlink.c
+++ b/lib/netlink-notifier.c
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include "rtnetlink.h"
+#include "netlink-notifier.h"
 
 #include <errno.h>
 #include <poll.h>

diff --git a/lib/rtnetlink.h b/lib/netlink-notifier.h
similarity index 100%
rename from lib/rtnetlink.h
rename to lib/netlink-notifier.h

diff --git a/lib/route-table.c b/lib/route-table.c
index 8212c54..22d12f7 100644 (file)
--- a/lib/route-table.c
+++ b/lib/route-table.c
@@ -27,9 +27,9 @@
 #include "hash.h"
 #include "hmap.h"
 #include "netlink.h"
+#include "netlink-notifier.h"
 #include "netlink-socket.h"
 #include "ofpbuf.h"
-#include "rtnetlink.h"
 #include "rtnetlink-link.h"
 #include "vlog.h"
 

diff --git a/lib/rtnetlink-link.c b/lib/rtnetlink-link.c
index 98ab399..7503585 100644 (file)
--- a/lib/rtnetlink-link.c
+++ b/lib/rtnetlink-link.c
@@ -23,8 +23,8 @@
 #include <net/if.h>
 
 #include "netlink.h"
+#include "netlink-notifier.h"
 #include "ofpbuf.h"
-#include "rtnetlink.h"
 
 static struct rtnetlink *rtn = NULL;
 static struct rtnetlink_link_change rtn_change;

diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c
index c88684f..f42f01b 100644 (file)
--- a/vswitchd/ovs-brcompatd.c
+++ b/vswitchd/ovs-brcompatd.c
@@ -43,13 +43,13 @@
 #include "leak-checker.h"
 #include "netdev.h"
 #include "netlink.h"
+#include "netlink-notifier.h"
 #include "netlink-socket.h"
 #include "ofpbuf.h"
 #include "openvswitch/brcompat-netlink.h"
 #include "packets.h"
 #include "poll-loop.h"
 #include "process.h"
-#include "rtnetlink.h"
 #include "rtnetlink-link.h"
 #include "signals.h"
 #include "sset.h"