From: Ben Pfaff Date: Mon, 31 Oct 2011 17:54:30 +0000 (-0700) Subject: netdev-vport: Again allow "tap" devices to be added to bridges. X-Git-Tag: v1.3.0~29 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0be6fb341f143e43d2cf46b6b2e0cdb840ab2dca;p=sliver-openvswitch.git 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 --- diff --git a/AUTHORS b/AUTHORS index 4c743b5b9..bc38e598a 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 0577bd3b4..620c22e94 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); }