ovs-vsctl: Make waiting for ovs-vswitchd to reload work again.

[openvswitch] / datapath / vport-internal_dev.c

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index 6cbfdf80db3bc1172268f5f3032db023a98cd199..52bd6ce61cde4e01ad672a4a2b9b678ab8ce1033 100644 (file)
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -37,7 +37,7 @@ static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev
        struct net_device_stats *stats = &internal_dev_priv(netdev)->stats;
 
        if (vport) {
-               struct odp_vport_stats vport_stats;
+               struct rtnl_link_stats64 vport_stats;
 
                vport_get_stats(vport, &vport_stats);
 
@@ -82,6 +82,7 @@ static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
 
        skb_reset_mac_header(skb);
        compute_ip_summed(skb, true);
+       OVS_CB(skb)->flow = NULL;
 
        vport_receive(vport, skb);
 
@@ -147,11 +148,6 @@ static int internal_dev_change_mtu(struct net_device *netdev, int new_mtu)
        return 0;
 }
 
-static void internal_dev_free(struct net_device *netdev)
-{
-       free_netdev(netdev);
-}
-
 static int internal_dev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
        if (dp_ioctl_hook)
@@ -188,7 +184,7 @@ static void do_setup(struct net_device *netdev)
        netdev->change_mtu = internal_dev_change_mtu;
 #endif
 
-       netdev->destructor = internal_dev_free;
+       netdev->destructor = free_netdev;
        SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
        netdev->tx_queue_len = 0;
 
@@ -293,7 +289,7 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
 
 struct vport_ops internal_vport_ops = {
        .type           = "internal",
-       .flags          = VPORT_F_REQUIRED | VPORT_F_GEN_STATS,
+       .flags          = VPORT_F_REQUIRED | VPORT_F_GEN_STATS | VPORT_F_FLOW,
        .create         = internal_dev_create,
        .destroy        = internal_dev_destroy,
        .attach         = internal_dev_attach,
@@ -328,6 +324,11 @@ int is_internal_vport(const struct vport *vport)
 
 struct vport *internal_dev_get_vport(struct net_device *netdev)
 {
-       struct internal_dev *internal_dev = internal_dev_priv(netdev);
+       struct internal_dev *internal_dev;
+
+       if (!is_internal_dev(netdev))
+               return NULL;
+       
+       internal_dev = internal_dev_priv(netdev);
        return rcu_dereference(internal_dev->attached_vport);
 }