aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2011-10-31 10:54:30 -0700
committerBen Pfaff <blp@nicira.com>2011-10-31 10:55:21 -0700
commit0be6fb341f143e43d2cf46b6b2e0cdb840ab2dca (patch)
treed42d34b3c7d26db650067564155ebceebaf57414
parentc34377e246867b8d81fc6ae7f945186db2e58d04 (diff)
netdev-vport: Again allow "tap" devices to be added to bridges.
I did not check that tap devices otherwise work. This at least allows them to be part of a bridge again. Reported-by: Janis Hamme <janis.hamme@student.kit.edu>
-rw-r--r--AUTHORS1
-rw-r--r--lib/netdev-vport.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 4c743b5b..bc38e598 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -75,6 +75,7 @@ Hector Oron hector.oron@gmail.com
Henrik Amren henrik@nicira.com
Jad Naous jnaous@gmail.com
Jan Medved jmedved@juniper.net
+Janis Hamme janis.hamme@student.kit.edu
Jed Daniels openvswitch@jeddaniels.com
Jeongkeun Lee jklee@hp.com
Joan Cirer joan@ev0.net
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 0577bd3b..620c22e9 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -131,7 +131,8 @@ netdev_vport_get_vport_type(const struct netdev *netdev)
return (is_vport_class(class) ? vport_class_cast(class)->type
: class == &netdev_internal_class ? OVS_VPORT_TYPE_INTERNAL
- : class == &netdev_linux_class ? OVS_VPORT_TYPE_NETDEV
+ : (class == &netdev_linux_class ||
+ class == &netdev_tap_class) ? OVS_VPORT_TYPE_NETDEV
: OVS_VPORT_TYPE_UNSPEC);
}