git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
vswitchd
/
bridge.h
diff --git
a/vswitchd/bridge.h
b/vswitchd/bridge.h
index
ecd6ff5
..
c1b0a2b
100644
(file)
--- a/
vswitchd/bridge.h
+++ b/
vswitchd/bridge.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
+/* Copyright (c) 2008, 2009, 2010, 2011
, 2012
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-16,6
+16,8
@@
#ifndef VSWITCHD_BRIDGE_H
#define VSWITCHD_BRIDGE_H 1
#ifndef VSWITCHD_BRIDGE_H
#define VSWITCHD_BRIDGE_H 1
+struct simap;
+
void bridge_init(const char *remote);
void bridge_exit(void);
void bridge_init(const char *remote);
void bridge_exit(void);
@@
-23,4
+25,6
@@
void bridge_run(void);
void bridge_run_fast(void);
void bridge_wait(void);
void bridge_run_fast(void);
void bridge_wait(void);
+void bridge_get_memory_usage(struct simap *usage);
+
#endif /* bridge.h */
#endif /* bridge.h */