diff options
| author | Ben Pfaff <blp@nicira.com> | 2013-01-02 17:10:43 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-01-04 09:05:36 -0800 |
| commit | 82c8c53c5b0dbbd6c56be6febf3a24b374ae0303 (patch) | |
| tree | c1b016383713397b3b6e60b85cb3f03c2cf643c8 /lib/vconn.h | |
| parent | a01b5c516d293765cfe564f5d340a6ccca9e0a29 (diff) | |
vconn: Fix parameters for vconn_open(), vconn_open_block(), pvconn_open().
The customary parameter order in Open vSwitch is to put input parameters
before output parameters, but vconn_open() and pvconn_open() had the 'dscp'
input parameter at the end, which bugged me a bit. Also,
vconn_open_block() didn't take a 'dscp' parameter at all even though it's
otherwise a wrapper around vconn_open(). This commit fixes all that up.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'lib/vconn.h')
| -rw-r--r-- | lib/vconn.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/vconn.h b/lib/vconn.h index 3f69a511..81bdcc97 100644 --- a/lib/vconn.h +++ b/lib/vconn.h @@ -34,8 +34,8 @@ void vconn_usage(bool active, bool passive, bool bootstrap); /* Active vconns: virtual connections to OpenFlow devices. */ int vconn_verify_name(const char *name); -int vconn_open(const char *name, uint32_t allowed_versions, - struct vconn **vconnp, uint8_t dscp); +int vconn_open(const char *name, uint32_t allowed_versions, uint8_t dscp, + struct vconn **vconnp); void vconn_close(struct vconn *); const char *vconn_get_name(const struct vconn *); uint32_t vconn_get_allowed_versions(const struct vconn *vconn); @@ -58,7 +58,7 @@ int vconn_transact_multiple_noreply(struct vconn *, struct list *requests, void vconn_run(struct vconn *); void vconn_run_wait(struct vconn *); -int vconn_open_block(const char *name, uint32_t allowed_versions, +int vconn_open_block(const char *name, uint32_t allowed_versions, uint8_t dscp, struct vconn **); int vconn_connect_block(struct vconn *); int vconn_send_block(struct vconn *, struct ofpbuf *); @@ -76,8 +76,8 @@ void vconn_send_wait(struct vconn *); /* Passive vconns: virtual listeners for incoming OpenFlow connections. */ int pvconn_verify_name(const char *name); -int pvconn_open(const char *name, uint32_t allowed_versions, - struct pvconn **pvconnp, uint8_t dscp); +int pvconn_open(const char *name, uint32_t allowed_versions, uint8_t dscp, + struct pvconn **pvconnp); const char *pvconn_get_name(const struct pvconn *); void pvconn_close(struct pvconn *); int pvconn_accept(struct pvconn *, struct vconn **); |