mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

Merge "master" into "next".

Browse Source 
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".
This commit is contained in:
Ben Pfaff
2010-02-11 11:11:23 -08:00
parent 62ee3464d9 67a4917b07
commit c69ee87c10
65 changed files with 287 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/dpif-netdev.c
View File

@@ -245,7 +245,7 @@ create_dp_netdev(const char *name, int dp_idx, struct dpif **dpifp)
}
static int
dpif_netdev_open(const char *name, const char *type UNUSED, bool create,
dpif_netdev_open(const char *name, const char *type OVS_UNUSED, bool create,
struct dpif **dpifp)
{
if (create) {
@@ -582,7 +582,7 @@ dpif_netdev_port_list(const struct dpif *dpif, struct odp_port *ports, int n)
}
static int
dpif_netdev_port_poll(const struct dpif *dpif_, char **devnamep UNUSED)
dpif_netdev_port_poll(const struct dpif *dpif_, char **devnamep OVS_UNUSED)
{
struct dpif_netdev *dpif = dpif_netdev_cast(dpif_);
if (dpif->dp_serial != dpif->dp->serial) {