projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Drop parameters from execute_actions().
[openvswitch]
/
datapath
/
vport-internal_dev.c
diff --git
a/datapath/vport-internal_dev.c
b/datapath/vport-internal_dev.c
index 1df61801179a0871f46072dbfce71a236f5cf7ce..fff4f4e596797b598da008c3e9d82f0a456d9e9d 100644
(file)
--- a/
datapath/vport-internal_dev.c
+++ b/
datapath/vport-internal_dev.c
@@
-6,6
+6,7
@@
* kernel, by Linus Torvalds and others.
*/
* kernel, by Linus Torvalds and others.
*/
+#include <linux/if_vlan.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
@@
-15,6
+16,7
@@
#include "checksum.h"
#include "datapath.h"
#include "checksum.h"
#include "datapath.h"
+#include "vlan.h"
#include "vport-generic.h"
#include "vport-internal_dev.h"
#include "vport-netdev.h"
#include "vport-generic.h"
#include "vport-internal_dev.h"
#include "vport-netdev.h"
@@
-72,6
+74,7
@@
static int internal_dev_mac_addr(struct net_device *dev, void *p)
static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
{
compute_ip_summed(skb, true);
static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
{
compute_ip_summed(skb, true);
+ vlan_copy_skb_tci(skb);
OVS_CB(skb)->flow = NULL;
vport_receive(internal_dev_priv(netdev)->vport, skb);
OVS_CB(skb)->flow = NULL;
vport_receive(internal_dev_priv(netdev)->vport, skb);
@@
-129,6
+132,14
@@
static int internal_dev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int
return -EOPNOTSUPP;
}
return -EOPNOTSUPP;
}
+static void internal_dev_destructor(struct net_device *dev)
+{
+ struct vport *vport = internal_dev_get_vport(dev);
+
+ vport_free(vport);
+ free_netdev(dev);
+}
+
#ifdef HAVE_NET_DEVICE_OPS
static const struct net_device_ops internal_dev_netdev_ops = {
.ndo_open = internal_dev_open,
#ifdef HAVE_NET_DEVICE_OPS
static const struct net_device_ops internal_dev_netdev_ops = {
.ndo_open = internal_dev_open,
@@
-157,7
+168,7
@@
static void do_setup(struct net_device *netdev)
netdev->change_mtu = internal_dev_change_mtu;
#endif
netdev->change_mtu = internal_dev_change_mtu;
#endif
- netdev->destructor =
free_netdev
;
+ netdev->destructor =
internal_dev_destructor
;
SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
netdev->tx_queue_len = 0;
SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
netdev->tx_queue_len = 0;
@@
-165,6
+176,11
@@
static void do_setup(struct net_device *netdev)
netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |
NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO;
netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |
NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+ netdev->vlan_features = netdev->features;
+ netdev->features |= NETIF_F_HW_VLAN_TX;
+#endif
+
vport_gen_rand_ether_addr(netdev->dev_addr);
}
vport_gen_rand_ether_addr(netdev->dev_addr);
}
@@
-216,9
+232,8
@@
static int internal_dev_destroy(struct vport *vport)
netif_stop_queue(netdev_vport->dev);
dev_set_promiscuity(netdev_vport->dev, -1);
netif_stop_queue(netdev_vport->dev);
dev_set_promiscuity(netdev_vport->dev, -1);
- unregister_netdevice(netdev_vport->dev);
/* unregister_netdevice() waits for an RCU grace period. */
/* unregister_netdevice() waits for an RCU grace period. */
-
vport_free(vport
);
+
unregister_netdevice(netdev_vport->dev
);
return 0;
}
return 0;
}
@@
-228,8
+243,13
@@
static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
struct net_device *netdev = netdev_vport_priv(vport)->dev;
int len;
struct net_device *netdev = netdev_vport_priv(vport)->dev;
int len;
- skb->dev = netdev;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+ if (unlikely(vlan_deaccel_tag(skb)))
+ return 0;
+#endif
+
len = skb->len;
len = skb->len;
+ skb->dev = netdev;
skb->pkt_type = PACKET_HOST;
skb->protocol = eth_type_trans(skb, netdev);
skb->pkt_type = PACKET_HOST;
skb->protocol = eth_type_trans(skb, netdev);