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.c | |
| 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.c')
| -rw-r--r-- | lib/vconn.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/vconn.c b/lib/vconn.c index 4e92834e..a3792ece 100644 --- a/lib/vconn.c +++ b/lib/vconn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2008, 2009, 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. @@ -223,8 +223,8 @@ vconn_verify_name(const char *name) * stores a pointer to the new connection in '*vconnp', otherwise a null * pointer. */ int -vconn_open(const char *name, uint32_t allowed_versions, - struct vconn **vconnp, uint8_t dscp) +vconn_open(const char *name, uint32_t allowed_versions, uint8_t dscp, + struct vconn **vconnp) { struct vconn_class *class; struct vconn *vconn; @@ -295,7 +295,7 @@ vconn_run_wait(struct vconn *vconn) } int -vconn_open_block(const char *name, uint32_t allowed_versions, +vconn_open_block(const char *name, uint32_t allowed_versions, uint8_t dscp, struct vconn **vconnp) { struct vconn *vconn; @@ -303,7 +303,7 @@ vconn_open_block(const char *name, uint32_t allowed_versions, fatal_signal_run(); - error = vconn_open(name, allowed_versions, &vconn, DSCP_DEFAULT); + error = vconn_open(name, allowed_versions, dscp, &vconn); if (!error) { error = vconn_connect_block(vconn); } @@ -986,8 +986,8 @@ pvconn_verify_name(const char *name) * stores a pointer to the new connection in '*pvconnp', otherwise a null * pointer. */ int -pvconn_open(const char *name, uint32_t allowed_versions, - struct pvconn **pvconnp, uint8_t dscp) +pvconn_open(const char *name, uint32_t allowed_versions, uint8_t dscp, + struct pvconn **pvconnp) { struct pvconn_class *class; struct pvconn *pvconn; |