X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fbridge.h;h=d1ca988ef070a8921a89fc29b0e6ab5d33a4c908;hb=28c5588e8e1a8d091c5d2275232c35f2968a97fa;hp=b9435370aeb67be675aa1aae4be46a61d680ccf0;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=sliver-openvswitch.git

diff --git a/vswitchd/bridge.h b/vswitchd/bridge.h
index b9435370a..d1ca988ef 100644
--- a/vswitchd/bridge.h
+++ b/vswitchd/bridge.h
@@ -1,43 +1,31 @@
-/* Copyright (c) 2008, 2009 Nicira Networks
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2014 Nicira, Inc.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * In addition, as a special exception, Nicira Networks gives permission
- * to link the code of its release of vswitchd with the OpenSSL project's
- * "OpenSSL" library (or with modified versions of it that use the same
- * license as the "OpenSSL" library), and distribute the linked
- * executables.  You must obey the GNU General Public License in all
- * respects for all of the code used other than "OpenSSL".  If you modify
- * this file, you may extend this exception to your version of the file,
- * but you are not obligated to do so.  If you do not wish to do so,
- * delete this exception statement from your version.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #ifndef VSWITCHD_BRIDGE_H
 #define VSWITCHD_BRIDGE_H 1
 
-#include <stddef.h>
-#include "list.h"
+struct simap;
 
-struct svec;
+void bridge_init(const char *remote);
+void bridge_exit(void);
 
-void bridge_init(void);
-void bridge_reconfigure(void);
-int bridge_run(void);
+void bridge_enable_of14(void);
+
+void bridge_run(void);
 void bridge_wait(void);
-bool bridge_exists(const char *);
-uint64_t bridge_get_datapathid(const char *name);
-void bridge_get_ifaces(struct svec *svec);
+
+void bridge_get_memory_usage(struct simap *usage);
 
 #endif /* bridge.h */