diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-08-05 14:18:06 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-08-08 12:55:43 -0700 |
| commit | 18812dff32ce650440b9f1eac1bb00afe08c621a (patch) | |
| tree | 1abd453fbc096d8eb300a0f6d514c4d24360e040 /ofproto | |
| parent | de5cdb90f7c02d22b0595c7dc311c5306291b02f (diff) | |
| download | openvswitch-18812dff32ce650440b9f1eac1bb00afe08c621a.tar.gz | |
netdev: Get rid of struct netdev_options and netdev_open_default().
Now that netdev_options only has two members, we might as well pass them
directly as parameters.
Diffstat (limited to 'ofproto')
| -rw-r--r-- | ofproto/in-band.c | 4 | ||||
| -rw-r--r-- | ofproto/ofproto-dpif-sflow.c | 4 | ||||
| -rw-r--r-- | ofproto/ofproto.c | 7 |
3 files changed, 5 insertions, 10 deletions
diff --git a/ofproto/in-band.c b/ofproto/in-band.c index 764b25296..f9dd21823 100644 --- a/ofproto/in-band.c +++ b/ofproto/in-band.c @@ -131,7 +131,7 @@ refresh_remote(struct in_band *ib, struct in_band_remote *r) { netdev_close(r->remote_netdev); - retval = netdev_open_default(next_hop_dev, &r->remote_netdev); + retval = netdev_open(next_hop_dev, "system", &r->remote_netdev); if (retval) { VLOG_WARN_RL(&rl, "cannot open netdev %s (next hop " "to controller "IP_FMT"): %s", @@ -472,7 +472,7 @@ in_band_create(struct ofproto *ofproto, const char *local_name, int error; *in_bandp = NULL; - error = netdev_open_default(local_name, &local_netdev); + error = netdev_open(local_name, "system", &local_netdev); if (error) { VLOG_ERR("failed to initialize in-band control: cannot open " "datapath local port %s (%s)", local_name, strerror(error)); diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c index d2da42b04..303623cde 100644 --- a/ofproto/ofproto-dpif-sflow.c +++ b/ofproto/ofproto-dpif-sflow.c @@ -235,7 +235,7 @@ sflow_choose_agent_address(const char *agent_device, const char *control_ip, if (agent_device) { struct netdev *netdev; - if (!netdev_open_default(agent_device, &netdev)) { + if (!netdev_open(agent_device, "system", &netdev)) { int error = netdev_get_in4(netdev, &in4, NULL); netdev_close(netdev); if (!error) { @@ -337,7 +337,7 @@ dpif_sflow_add_port(struct dpif_sflow *ds, uint16_t odp_port, dpif_sflow_del_port(ds, odp_port); /* Open network device. */ - error = netdev_open_default(netdev_name, &netdev); + error = netdev_open(netdev_name, "system", &netdev); if (error) { VLOG_WARN_RL(&rl, "failed to open network device \"%s\": %s", netdev_name, strerror(error)); diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 8054d05cd..6203676e2 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -1107,16 +1107,11 @@ static struct netdev * ofport_open(const struct ofproto_port *ofproto_port, struct ofp_phy_port *opp) { uint32_t curr, advertised, supported, peer; - struct netdev_options netdev_options; enum netdev_flags flags; struct netdev *netdev; int error; - memset(&netdev_options, 0, sizeof netdev_options); - netdev_options.name = ofproto_port->name; - netdev_options.type = ofproto_port->type; - - error = netdev_open(&netdev_options, &netdev); + error = netdev_open(ofproto_port->name, ofproto_port->type, &netdev); if (error) { VLOG_WARN_RL(&rl, "ignoring port %s (%"PRIu16") because netdev %s " "cannot be opened (%s)", |