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 /utilities/ovs-discover.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 'utilities/ovs-discover.c')
-rw-r--r-- | utilities/ovs-discover.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/utilities/ovs-discover.c b/utilities/ovs-discover.c index 0b7d92d6..3830e073 100644 --- a/utilities/ovs-discover.c +++ b/utilities/ovs-discover.c @@ -60,7 +60,7 @@ static bool exit_without_bind; static bool exit_after_bind; static bool iface_init(struct iface *, const char *netdev_name); -static void release_ifaces(void *aux UNUSED); +static void release_ifaces(void *aux OVS_UNUSED); static void parse_options(int argc, char *argv[]); static void usage(void) NO_RETURN; @@ -238,7 +238,7 @@ iface_init(struct iface *iface, const char *netdev_name) } static void -release_ifaces(void *aux UNUSED) +release_ifaces(void *aux OVS_UNUSED) { int i; @@ -252,13 +252,13 @@ release_ifaces(void *aux UNUSED) } static void -modify_dhcp_request(struct dhcp_msg *msg, void *aux UNUSED) +modify_dhcp_request(struct dhcp_msg *msg, void *aux OVS_UNUSED) { dhcp_msg_put_string(msg, DHCP_CODE_VENDOR_CLASS, "OpenFlow"); } static bool -validate_dhcp_offer(const struct dhcp_msg *msg, void *aux UNUSED) +validate_dhcp_offer(const struct dhcp_msg *msg, void *aux OVS_UNUSED) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(60, 60); char *vconn_name; |