coverage: Make the coverage counters catalog program-specific.

[sliver-openvswitch.git] / lib / rtnetlink.c

diff --git a/lib/rtnetlink.c b/lib/rtnetlink.c
index 29e02f6..9beddb1 100644 (file)
--- a/lib/rtnetlink.c
+++ b/lib/rtnetlink.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,10 +27,12 @@
 #include "coverage.h"
 #include "netlink.h"
 #include "ofpbuf.h"
-
-#define THIS_MODULE VLM_rtnetlink
 #include "vlog.h"
 
+VLOG_DEFINE_THIS_MODULE(rtnetlink);
+
+COVERAGE_DEFINE(rtnetlink_changed);
+
 /* rtnetlink socket. */
 static struct nl_sock *notify_sock;
 
@@ -76,7 +78,7 @@ rtnetlink_notifier_register(struct rtnetlink_notifier *notifier,
 }
 
 /* Cancels notification on 'notifier', which must have previously been
- * registered with lxnetdev_notifier_register(). */
+ * registered with rtnetlink_notifier_register(). */
 void
 rtnetlink_notifier_unregister(struct rtnetlink_notifier *notifier)
 {
@@ -166,8 +168,7 @@ rtnetlink_report_change(const struct nlmsghdr *nlmsg,
     change.master_ifindex = (attrs[IFLA_MASTER]
                              ? nl_attr_get_u32(attrs[IFLA_MASTER]) : 0);
 
-    LIST_FOR_EACH (notifier, struct rtnetlink_notifier, node,
-                   &all_notifiers) {
+    LIST_FOR_EACH (notifier, node, &all_notifiers) {
         notifier->cb(&change, notifier->aux);
     }
 }
@@ -177,8 +178,7 @@ rtnetlink_report_notify_error(void)
 {
     struct rtnetlink_notifier *notifier;
 
-    LIST_FOR_EACH (notifier, struct rtnetlink_notifier, node,
-                   &all_notifiers) {
+    LIST_FOR_EACH (notifier, node, &all_notifiers) {
         notifier->cb(NULL, notifier->aux);
     }
 }