projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Always call ovs-vsctl in bring_down().
[openvswitch]
/
lib
/
dpif-netdev.c
diff --git
a/lib/dpif-netdev.c
b/lib/dpif-netdev.c
index 8abf1f93f306219353abe1f304d99102e939e627..1dee14b476e92c690a341ad6ea91db9b2b78588a 100644
(file)
--- a/
lib/dpif-netdev.c
+++ b/
lib/dpif-netdev.c
@@
-64,7
+64,7
@@
struct dp_netdev {
struct list node;
int dp_idx;
int open_cnt;
struct list node;
int dp_idx;
int open_cnt;
- bool de
let
ed;
+ bool de
stroy
ed;
bool drop_frags; /* Drop all IP fragments, if true. */
struct ovs_queue queues[N_QUEUES]; /* Messages queued for dpif_recv(). */
bool drop_frags; /* Drop all IP fragments, if true. */
struct ovs_queue queues[N_QUEUES]; /* Messages queued for dpif_recv(). */
@@
-245,7
+245,7
@@
create_dp_netdev(const char *name, int dp_idx, struct dpif **dpifp)
}
static int
}
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) {
struct dpif **dpifp)
{
if (create) {
@@
-307,17
+307,17
@@
dpif_netdev_close(struct dpif *dpif)
{
struct dp_netdev *dp = get_dp_netdev(dpif);
assert(dp->open_cnt > 0);
{
struct dp_netdev *dp = get_dp_netdev(dpif);
assert(dp->open_cnt > 0);
- if (--dp->open_cnt == 0 && dp->de
let
ed) {
+ if (--dp->open_cnt == 0 && dp->de
stroy
ed) {
dp_netdev_free(dp);
}
free(dpif);
}
static int
dp_netdev_free(dp);
}
free(dpif);
}
static int
-dpif_netdev_de
lete
(struct dpif *dpif)
+dpif_netdev_de
stroy
(struct dpif *dpif)
{
struct dp_netdev *dp = get_dp_netdev(dpif);
{
struct dp_netdev *dp = get_dp_netdev(dpif);
- dp->de
let
ed = true;
+ dp->de
stroy
ed = true;
return 0;
}
return 0;
}
@@
-582,7
+582,7
@@
dpif_netdev_port_list(const struct dpif *dpif, struct odp_port *ports, int n)
}
static int
}
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) {
{
struct dpif_netdev *dpif = dpif_netdev_cast(dpif_);
if (dpif->dp_serial != dpif->dp->serial) {
@@
-1310,7
+1310,7
@@
const struct dpif_class dpif_netdev_class = {
dpif_netdev_open,
dpif_netdev_close,
NULL, /* get_all_names */
dpif_netdev_open,
dpif_netdev_close,
NULL, /* get_all_names */
- dpif_netdev_de
lete
,
+ dpif_netdev_de
stroy
,
dpif_netdev_get_stats,
dpif_netdev_get_drop_frags,
dpif_netdev_set_drop_frags,
dpif_netdev_get_stats,
dpif_netdev_get_drop_frags,
dpif_netdev_set_drop_frags,