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
ofproto: Inline trivial functions.
[sliver-openvswitch.git]
/
lib
/
multipath.h
diff --git
a/lib/multipath.h
b/lib/multipath.h
index
1b5160d
..
0673050
100644
(file)
--- a/
lib/multipath.h
+++ b/
lib/multipath.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2010, 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-18,10
+18,12
@@
#define MULTIPATH_H 1
#include <stdint.h>
#define MULTIPATH_H 1
#include <stdint.h>
+#include "compiler.h"
#include "ofp-errors.h"
struct ds;
struct flow;
#include "ofp-errors.h"
struct ds;
struct flow;
+struct flow_wildcards;
struct nx_action_multipath;
struct ofpact_multipath;
struct ofpbuf;
struct nx_action_multipath;
struct ofpact_multipath;
struct ofpbuf;
@@
-38,9
+40,11
@@
enum ofperr multipath_check(const struct ofpact_multipath *,
void multipath_to_nxast(const struct ofpact_multipath *,
struct ofpbuf *openflow);
void multipath_to_nxast(const struct ofpact_multipath *,
struct ofpbuf *openflow);
-void multipath_execute(const struct ofpact_multipath *, struct flow *);
+void multipath_execute(const struct ofpact_multipath *, struct flow *,
+ struct flow_wildcards *);
-void multipath_parse(struct ofpact_multipath *, const char *);
+char *multipath_parse(struct ofpact_multipath *, const char *)
+ WARN_UNUSED_RESULT;
void multipath_format(const struct ofpact_multipath *, struct ds *);
#endif /* multipath.h */
void multipath_format(const struct ofpact_multipath *, struct ds *);
#endif /* multipath.h */