X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Froute-table.c;h=5891ae8e37c81320d9172ad622356487b883c632;hb=f80022d9df98d29ee41176a4bc6cb91025da84b8;hp=8e54b2848983727e12511f23a065f9150460df36;hpb=896b32721d2d7a0bf0d032e174d066965cfa2b83;p=sliver-openvswitch.git

diff --git a/lib/route-table.c b/lib/route-table.c
index 8e54b2848..5891ae8e3 100644
--- a/lib/route-table.c
+++ b/lib/route-table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Nicira Networks.
+ * Copyright (c) 2011, 2012, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 #include "route-table.h"
 
-#include <assert.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <linux/rtnetlink.h>
@@ -161,8 +160,8 @@ void
 route_table_register(void)
 {
     if (!register_count) {
-        assert(!nln);
-        assert(!route_notifier);
+        ovs_assert(!nln);
+        ovs_assert(!route_notifier);
 
         nln = nln_create(NETLINK_ROUTE, RTNLGRP_IPV4_ROUTE,
                          (nln_parse_func *) route_table_parse, &rtmsg);
@@ -226,7 +225,7 @@ route_table_reset(void)
     struct nl_dump dump;
     struct rtgenmsg *rtmsg;
     struct ofpbuf request, reply;
-    static struct nl_sock *rtnl_sock;
+    struct nl_sock *rtnl_sock;
 
     route_map_clear();
     route_table_valid = true;
@@ -273,7 +272,7 @@ route_table_parse(struct ofpbuf *buf, struct route_table_msg *change)
         [RTA_OIF] = { .type = NL_A_U32, .optional = false },
     };
 
-    static struct nlattr *attrs[ARRAY_SIZE(policy)];
+    struct nlattr *attrs[ARRAY_SIZE(policy)];
 
     parsed = nl_policy_parse(buf, NLMSG_HDRLEN + sizeof(struct rtmsg),
                              policy, attrs, ARRAY_SIZE(policy));
@@ -422,7 +421,7 @@ name_table_reset(void)
     struct nl_dump dump;
     struct rtgenmsg *rtmsg;
     struct ofpbuf request, reply;
-    static struct nl_sock *rtnl_sock;
+    struct nl_sock *rtnl_sock;
 
     name_table_valid = true;
     name_map_clear();