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 35724d9bf837be03b3f8b9eab9d33111c273b0af..1dee14b476e92c690a341ad6ea91db9b2b78588a 100644
(file)
--- a/
lib/dpif-netdev.c
+++ b/
lib/dpif-netdev.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009
, 2010
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-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(). */
@@
-196,7
+196,7
@@
create_dpif_netdev(struct dp_netdev *dp)
dp->open_cnt++;
dp->open_cnt++;
- dpname = xasprintf("
netdev:
dp%d", dp->dp_idx);
+ dpname = xasprintf("dp%d", dp->dp_idx);
dpif = xmalloc(sizeof *dpif);
dpif_init(&dpif->dpif, &dpif_netdev_class, dpname, dp->dp_idx, dp->dp_idx);
dpif->dp = dp;
dpif = xmalloc(sizeof *dpif);
dpif_init(&dpif->dpif, &dpif_netdev_class, dpname, dp->dp_idx, dp->dp_idx);
dpif->dp = dp;
@@
-219,7
+219,7
@@
create_dp_netdev(const char *name, int dp_idx, struct dpif **dpifp)
}
/* Create datapath. */
}
/* Create datapath. */
- dp_netdevs[dp_idx] = dp = x
calloc(1,
sizeof *dp);
+ dp_netdevs[dp_idx] = dp = x
zalloc(
sizeof *dp);
list_push_back(&dp_netdev_list, &dp->node);
dp->dp_idx = dp_idx;
dp->open_cnt = 0;
list_push_back(&dp_netdev_list, &dp->node);
dp->dp_idx = dp_idx;
dp->open_cnt = 0;
@@
-237,7
+237,7
@@
create_dp_netdev(const char *name, int dp_idx, struct dpif **dpifp)
error = do_add_port(dp, name, ODP_PORT_INTERNAL, ODPP_LOCAL);
if (error) {
dp_netdev_free(dp);
error = do_add_port(dp, name, ODP_PORT_INTERNAL, ODPP_LOCAL);
if (error) {
dp_netdev_free(dp);
- return
error
;
+ return
ENODEV
;
}
*dpifp = create_dpif_netdev(dp);
}
*dpifp = create_dpif_netdev(dp);
@@
-245,20
+245,20
@@
create_dp_netdev(const char *name, int dp_idx, struct dpif **dpifp)
}
static int
}
static int
-dpif_netdev_open(const char *name
UNUSED, char *suffix
, 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) {
- if (find_dp_netdev(
suffix
)) {
+ if (find_dp_netdev(
name
)) {
return EEXIST;
} else {
return EEXIST;
} else {
- int dp_idx = name_to_dp_idx(
suffix
);
+ int dp_idx = name_to_dp_idx(
name
);
if (dp_idx >= 0) {
if (dp_idx >= 0) {
- return create_dp_netdev(
suffix
, dp_idx, dpifp);
+ return create_dp_netdev(
name
, dp_idx, dpifp);
} else {
/* Scan for unused dp_idx number. */
for (dp_idx = 0; dp_idx < N_DP_NETDEVS; dp_idx++) {
} else {
/* Scan for unused dp_idx number. */
for (dp_idx = 0; dp_idx < N_DP_NETDEVS; dp_idx++) {
- int error = create_dp_netdev(
suffix
, dp_idx, dpifp);
+ int error = create_dp_netdev(
name
, dp_idx, dpifp);
if (error != EBUSY) {
return error;
}
if (error != EBUSY) {
return error;
}
@@
-269,7
+269,7
@@
dpif_netdev_open(const char *name UNUSED, char *suffix, bool create,
}
}
} else {
}
}
} else {
- struct dp_netdev *dp = find_dp_netdev(
suffix
);
+ struct dp_netdev *dp = find_dp_netdev(
name
);
if (dp) {
*dpifp = create_dpif_netdev(dp);
return 0;
if (dp) {
*dpifp = create_dpif_netdev(dp);
return 0;
@@
-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;
}
@@
-363,6
+363,7
@@
do_add_port(struct dp_netdev *dp, const char *devname, uint16_t flags,
{
bool internal = (flags & ODP_PORT_INTERNAL) != 0;
struct dp_netdev_port *port;
{
bool internal = (flags & ODP_PORT_INTERNAL) != 0;
struct dp_netdev_port *port;
+ struct netdev_options netdev_options;
struct netdev *netdev;
int mtu;
int error;
struct netdev *netdev;
int mtu;
int error;
@@
-370,13
+371,17
@@
do_add_port(struct dp_netdev *dp, const char *devname, uint16_t flags,
/* XXX reject devices already in some dp_netdev. */
/* Open and validate network device. */
/* XXX reject devices already in some dp_netdev. */
/* Open and validate network device. */
- if (!internal) {
- error = netdev_open(devname, NETDEV_ETH_TYPE_ANY, &netdev);
+ memset(&netdev_options, 0, sizeof netdev_options);
+ netdev_options.name = devname;
+ netdev_options.ethertype = NETDEV_ETH_TYPE_ANY;
+ netdev_options.may_create = true;
+ if (internal) {
+ netdev_options.type = "tap";
} else {
} else {
- char *tapname = xasprintf("tap:%s", devname);
- error = netdev_open(tapname, NETDEV_ETH_TYPE_ANY, &netdev);
- free(tapname);
+ netdev_options.may_open = true;
}
}
+
+ error = netdev_open(&netdev_options, &netdev);
if (error) {
return error;
}
if (error) {
return error;
}
@@
-468,6
+473,7
@@
static int
do_del_port(struct dp_netdev *dp, uint16_t port_no)
{
struct dp_netdev_port *port;
do_del_port(struct dp_netdev *dp, uint16_t port_no)
{
struct dp_netdev_port *port;
+ char *name;
int error;
error = get_port_by_number(dp, port_no, &port);
int error;
error = get_port_by_number(dp, port_no, &port);
@@
-480,7
+486,10
@@
do_del_port(struct dp_netdev *dp, uint16_t port_no)
dp->n_ports--;
dp->serial++;
dp->n_ports--;
dp->serial++;
+ name = xstrdup(netdev_get_name(port->netdev));
netdev_close(port->netdev);
netdev_close(port->netdev);
+
+ free(name);
free(port);
return 0;
free(port);
return 0;
@@
-573,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) {
@@
-794,7
+803,7
@@
add_flow(struct dpif *dpif, struct odp_flow *odp_flow)
struct dp_netdev_flow *flow;
int error;
struct dp_netdev_flow *flow;
int error;
- flow = x
calloc(1,
sizeof *flow);
+ flow = x
zalloc(
sizeof *flow);
flow->key = odp_flow->key;
flow->key.reserved = 0;
flow->key = odp_flow->key;
flow->key.reserved = 0;
@@
-1294,7
+1303,6
@@
dp_netdev_execute_actions(struct dp_netdev *dp,
}
const struct dpif_class dpif_netdev_class = {
}
const struct dpif_class dpif_netdev_class = {
- "netdev",
"netdev",
dp_netdev_run,
dp_netdev_wait,
"netdev",
dp_netdev_run,
dp_netdev_wait,
@@
-1302,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,
@@
-1323,6
+1331,8
@@
const struct dpif_class dpif_netdev_class = {
dpif_netdev_execute,
dpif_netdev_recv_get_mask,
dpif_netdev_recv_set_mask,
dpif_netdev_execute,
dpif_netdev_recv_get_mask,
dpif_netdev_recv_set_mask,
+ NULL, /* get_sflow_probability */
+ NULL, /* set_sflow_probability */
dpif_netdev_recv,
dpif_netdev_recv_wait,
};
dpif_netdev_recv,
dpif_netdev_recv_wait,
};