diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-02-11 11:11:23 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-02-11 11:11:23 -0800 |
| commit | c69ee87c10818267f991236201150b1fa51ae519 (patch) | |
| tree | abea72de06ca718ef0296b88ee84a1bf889fed8c /lib/vconn.c | |
| parent | 62ee3464d99c0e37f38b503321cd46181c5c7617 (diff) | |
| parent | 67a4917b07031b387beafaedce413b4207214059 (diff) | |
Merge "master" into "next".
The main change here is the need to update all of the uses of UNUSED in
the next branch to OVS_UNUSED as it is now spelled on "master".
Diffstat (limited to 'lib/vconn.c')
| -rw-r--r-- | lib/vconn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vconn.c b/lib/vconn.c index 1445be48..c77b6524 100644 --- a/lib/vconn.c +++ b/lib/vconn.c @@ -120,7 +120,7 @@ check_vconn_classes(void) * connection methods supported by the vconn. If 'bootstrap' is true, also * advertises options to bootstrap the CA certificate. */ void -vconn_usage(bool active, bool passive, bool bootstrap UNUSED) +vconn_usage(bool active, bool passive, bool bootstrap OVS_UNUSED) { /* Really this should be implemented via callbacks into the vconn * providers, but that seems too heavy-weight to bother with at the |