[ovs-dev] [PATCH 4/6] netdev-vport: New helper netdev_get_vport_dev().
Ethan Jackson
ethan at nicira.com
Thu Dec 27 01:16:44 UTC 2012
Signed-off-by: Ethan Jackson <ethan at nicira.com>
---
lib/netdev-vport.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 259d1d1..36926ed 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -101,6 +101,12 @@ netdev_dev_vport_cast(const struct netdev_dev *netdev_dev)
return CONTAINER_OF(netdev_dev, struct netdev_dev_vport, netdev_dev);
}
+static struct netdev_dev_vport *
+netdev_get_vport_dev(const struct netdev *netdev)
+{
+ return netdev_dev_vport_cast(netdev_get_dev(netdev));
+}
+
static struct netdev_vport *
netdev_vport_cast(const struct netdev *netdev)
{
@@ -400,12 +406,11 @@ netdev_vport_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
static int
tunnel_get_status(const struct netdev *netdev, struct smap *smap)
{
+ struct netdev_dev_vport *ndv = netdev_get_vport_dev(netdev);
struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1];
- struct netdev_dev_vport *ndv;
static char iface[IFNAMSIZ];
ovs_be32 route;
- ndv = netdev_dev_vport_cast(netdev_get_dev(netdev));
if (!ndv->options) {
/* Race condition when 'ndv' was created, but did not have it's
* configuration set yet. */
@@ -449,7 +454,7 @@ netdev_vport_update_flags(struct netdev *netdev OVS_UNUSED,
static unsigned int
netdev_vport_change_seq(const struct netdev *netdev)
{
- return netdev_dev_vport_cast(netdev_get_dev(netdev))->change_seq;
+ return netdev_get_vport_dev(netdev)->change_seq;
}
static void
@@ -469,9 +474,7 @@ netdev_vport_wait(void)
static void
netdev_vport_poll_notify(const struct netdev *netdev)
{
- struct netdev_dev_vport *ndv;
-
- ndv = netdev_dev_vport_cast(netdev_get_dev(netdev));
+ struct netdev_dev_vport *ndv = netdev_get_vport_dev(netdev);
ndv->change_seq++;
if (!ndv->change_seq) {
--
1.7.9.5
More information about the dev
mailing list