X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fovs-brcompatd.c;h=585ab2c70576f3f080ddf84f890e0ebde5fc3fb9;hb=23935e8bcb5be3e82ed2fb16333fdbea36eedfcd;hp=34162f3eb1d831ad4cdd95efaeffdfb7ad01fd30;hpb=5ff22a0642fb299140e7b3e62588be692386c0b8;p=openvswitch diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c index 34162f3e..585ab2c7 100644 --- a/vswitchd/ovs-brcompatd.c +++ b/vswitchd/ovs-brcompatd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009 Nicira Networks +/* Copyright (c) 2008, 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. @@ -755,7 +755,7 @@ handle_fdb_query_cmd(const struct ovsrec_open_vswitch *ovs, struct mac *mac = &local_macs[n_local_macs]; struct netdev *netdev; - error = netdev_open(iface_name, NETDEV_ETH_TYPE_NONE, &netdev); + error = netdev_open_default(iface_name, &netdev); if (netdev) { if (!netdev_get_etheraddr(netdev, mac->addr)) { n_local_macs++; @@ -1144,6 +1144,7 @@ main(int argc, char *argv[]) struct ovsdb_idl *idl; int retval; + proctitle_init(argc, argv); set_program_name(argv[0]); time_init(); vlog_init(); @@ -1159,7 +1160,7 @@ main(int argc, char *argv[]) retval = unixctl_server_create(NULL, &unixctl); if (retval) { - ovs_fatal(retval, "could not listen for vlog connections"); + exit(EXIT_FAILURE); } if (brc_open(&brc_sock)) { @@ -1190,7 +1191,7 @@ main(int argc, char *argv[]) ovs = ovsrec_open_vswitch_first(idl); brc_recv_update(ovs); - if (!ovs && ovsdb_idl_get_seqno(idl)) { + if (!ovs && ovsdb_idl_has_ever_connected(idl)) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); VLOG_WARN_RL(&rl, "%s: database does not contain any Open vSwitch " "configuration", remote);