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-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=f956fd128a3fd3c466470096aa0fc35789c1a3bf;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 b80bfdfb8..4c24be14e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -70,6 +70,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 b9c1bfe61..82fb73e81 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 ? ODP_VPORT_TYPE_INTERNAL - : class == &netdev_linux_class ? ODP_VPORT_TYPE_NETDEV + : (class == &netdev_linux_class || + class == &netdev_tap_class) ? ODP_VPORT_TYPE_NETDEV : ODP_VPORT_TYPE_UNSPEC); }