aboutsummaryrefslogtreecommitdiff
path: root/lib/netdev-vport.c
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2013-03-08 15:09:42 -0800
committerBen Pfaff <blp@nicira.com>2013-05-10 14:42:30 -0700
commit180c6d0b440961cbc873c4d045eb8b2daa1364e9 (patch)
tree5dda8d438d47081bbe08aa1d66a86e99700fe4f5 /lib/netdev-vport.c
parent796223f5bc3a4896e6398733c798390158479400 (diff)
Rename superclass members to 'up'.
Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'lib/netdev-vport.c')
-rw-r--r--lib/netdev-vport.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index c1c3cbbc..3d4b3146 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -47,7 +47,7 @@ VLOG_DEFINE_THIS_MODULE(netdev_vport);
#define DEFAULT_TTL 64
struct netdev_dev_vport {
- struct netdev_dev netdev_dev;
+ struct netdev_dev up;
unsigned int change_seq;
uint8_t etheraddr[ETH_ADDR_LEN];
struct netdev_stats stats;
@@ -87,7 +87,7 @@ static struct netdev_dev_vport *
netdev_dev_vport_cast(const struct netdev_dev *netdev_dev)
{
ovs_assert(is_vport_class(netdev_dev_get_class(netdev_dev)));
- return CONTAINER_OF(netdev_dev, struct netdev_dev_vport, netdev_dev);
+ return CONTAINER_OF(netdev_dev, struct netdev_dev_vport, up);
}
static struct netdev_dev_vport *
@@ -159,11 +159,11 @@ netdev_vport_create(const struct netdev_class *netdev_class, const char *name,
struct netdev_dev_vport *dev;
dev = xzalloc(sizeof *dev);
- netdev_dev_init(&dev->netdev_dev, name, netdev_class);
+ netdev_dev_init(&dev->up, name, netdev_class);
dev->change_seq = 1;
eth_addr_random(dev->etheraddr);
- *netdev_devp = &dev->netdev_dev;
+ *netdev_devp = &dev->up;
route_table_register();
return 0;