X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-internal_dev.c;h=003e8800a1c948afa9bf8bda11f02a574052e8cb;hb=52a23d929a8ac1381455df323aba3fd014276960;hp=6448ab6050b6e4430e952968c373ea4ca648b7f7;hpb=a9a29d22d8f485bb90bb49ae9ddff8c3c1ab04f5;p=sliver-openvswitch.git diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c index 6448ab605..003e8800a 100644 --- a/datapath/vport-internal_dev.c +++ b/datapath/vport-internal_dev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Nicira Networks. + * Copyright (c) 2007-2012 Nicira, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -25,10 +25,12 @@ #include #include +#include +#include + #include "checksum.h" #include "datapath.h" #include "vlan.h" -#include "vport-generic.h" #include "vport-internal_dev.h" #include "vport-netdev.h" @@ -62,10 +64,10 @@ static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev struct net_device_stats *stats = &netdev->stats; #endif #endif - struct vport *vport = internal_dev_get_vport(netdev); + struct vport *vport = ovs_internal_dev_get_vport(netdev); struct ovs_vport_stats vport_stats; - vport_get_stats(vport, &vport_stats); + ovs_vport_get_stats(vport, &vport_stats); /* The tx and rx stats need to be swapped because the * switch and host OS have opposite perspectives. */ @@ -81,16 +83,6 @@ static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev return stats; } -static int internal_dev_mac_addr(struct net_device *dev, void *p) -{ - struct sockaddr *addr = p; - - if (!is_valid_ether_addr(addr->sa_data)) - return -EADDRNOTAVAIL; - memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); - return 0; -} - /* Called with rcu_read_lock_bh. */ static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) { @@ -100,10 +92,9 @@ static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) } vlan_copy_skb_tci(skb); - OVS_CB(skb)->flow = NULL; rcu_read_lock(); - vport_receive(internal_dev_priv(netdev)->vport, skb); + ovs_vport_receive(internal_dev_priv(netdev)->vport, skb); rcu_read_unlock(); return 0; } @@ -123,7 +114,7 @@ static int internal_dev_stop(struct net_device *netdev) static void internal_dev_getinfo(struct net_device *netdev, struct ethtool_drvinfo *info) { - strcpy(info->driver, "openvswitch"); + strlcpy(info->driver, "openvswitch", sizeof(info->driver)); } static const struct ethtool_ops internal_dev_ethtool_ops = { @@ -148,20 +139,11 @@ static int internal_dev_change_mtu(struct net_device *netdev, int new_mtu) return 0; } -static int internal_dev_do_ioctl(struct net_device *dev, - struct ifreq *ifr, int cmd) -{ - if (dp_ioctl_hook) - return dp_ioctl_hook(dev, ifr, cmd); - - return -EOPNOTSUPP; -} - static void internal_dev_destructor(struct net_device *dev) { - struct vport *vport = internal_dev_get_vport(dev); + struct vport *vport = ovs_internal_dev_get_vport(dev); - vport_free(vport); + ovs_vport_free(vport); free_netdev(dev); } @@ -170,8 +152,7 @@ static const struct net_device_ops internal_dev_netdev_ops = { .ndo_open = internal_dev_open, .ndo_stop = internal_dev_stop, .ndo_start_xmit = internal_dev_xmit, - .ndo_set_mac_address = internal_dev_mac_addr, - .ndo_do_ioctl = internal_dev_do_ioctl, + .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = internal_dev_change_mtu, #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) .ndo_get_stats64 = internal_dev_get_stats, @@ -188,7 +169,6 @@ static void do_setup(struct net_device *netdev) #ifdef HAVE_NET_DEVICE_OPS netdev->netdev_ops = &internal_dev_netdev_ops; #else - netdev->do_ioctl = internal_dev_do_ioctl; netdev->get_stats = internal_dev_sys_stats; netdev->hard_start_xmit = internal_dev_xmit; netdev->open = internal_dev_open; @@ -198,12 +178,13 @@ static void do_setup(struct net_device *netdev) #endif netdev->priv_flags &= ~IFF_TX_SKB_SHARING; + netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE; netdev->destructor = internal_dev_destructor; SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops); netdev->tx_queue_len = 0; netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST | - NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO; + NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) netdev->vlan_features = netdev->features; @@ -213,7 +194,7 @@ static void do_setup(struct net_device *netdev) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) netdev->hw_features = netdev->features & ~NETIF_F_LLTX; #endif - random_ether_addr(netdev->dev_addr); + eth_hw_addr_random(netdev); } static struct vport *internal_dev_create(const struct vport_parms *parms) @@ -223,8 +204,8 @@ static struct vport *internal_dev_create(const struct vport_parms *parms) struct internal_dev *internal_dev; int err; - vport = vport_alloc(sizeof(struct netdev_vport), - &internal_vport_ops, parms); + vport = ovs_vport_alloc(sizeof(struct netdev_vport), + &ovs_internal_vport_ops, parms); if (IS_ERR(vport)) { err = PTR_ERR(vport); goto error; @@ -239,9 +220,14 @@ static struct vport *internal_dev_create(const struct vport_parms *parms) goto error_free_vport; } + dev_net_set(netdev_vport->dev, ovs_dp_get_net(vport->dp)); internal_dev = internal_dev_priv(netdev_vport->dev); internal_dev->vport = vport; + /* Restrict bridge port to current netns. */ + if (vport->port_no == OVSP_LOCAL) + netdev_vport->dev->features |= NETIF_F_NETNS_LOCAL; + err = register_netdevice(netdev_vport->dev); if (err) goto error_free_netdev; @@ -254,7 +240,7 @@ static struct vport *internal_dev_create(const struct vport_parms *parms) error_free_netdev: free_netdev(netdev_vport->dev); error_free_vport: - vport_free(vport); + ovs_vport_free(vport); error: return ERR_PTR(err); } @@ -281,6 +267,11 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb) #endif len = skb->len; + + skb_dst_drop(skb); + nf_reset(skb); + secpath_reset(skb); + skb->dev = netdev; skb->pkt_type = PACKET_HOST; skb->protocol = eth_type_trans(skb, netdev); @@ -295,24 +286,17 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb) return len; } -const struct vport_ops internal_vport_ops = { +const struct vport_ops ovs_internal_vport_ops = { .type = OVS_VPORT_TYPE_INTERNAL, - .flags = VPORT_F_REQUIRED | VPORT_F_FLOW, + .flags = VPORT_F_REQUIRED, .create = internal_dev_create, .destroy = internal_dev_destroy, - .set_addr = netdev_set_addr, - .get_name = netdev_get_name, - .get_addr = netdev_get_addr, - .get_kobj = netdev_get_kobj, - .get_dev_flags = netdev_get_dev_flags, - .is_running = netdev_is_running, - .get_operstate = netdev_get_operstate, - .get_ifindex = netdev_get_ifindex, - .get_mtu = netdev_get_mtu, + .get_name = ovs_netdev_get_name, + .get_ifindex = ovs_netdev_get_ifindex, .send = internal_dev_recv, }; -int is_internal_dev(const struct net_device *netdev) +int ovs_is_internal_dev(const struct net_device *netdev) { #ifdef HAVE_NET_DEVICE_OPS return netdev->netdev_ops == &internal_dev_netdev_ops; @@ -321,9 +305,9 @@ int is_internal_dev(const struct net_device *netdev) #endif } -struct vport *internal_dev_get_vport(struct net_device *netdev) +struct vport *ovs_internal_dev_get_vport(struct net_device *netdev) { - if (!is_internal_dev(netdev)) + if (!ovs_is_internal_dev(netdev)) return NULL; return internal_dev_priv(netdev)->vport;