projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Replace customized xen-bugtool with plugin to collect qdisc info.
[openvswitch]
/
datapath
/
vport-internal_dev.c
diff --git
a/datapath/vport-internal_dev.c
b/datapath/vport-internal_dev.c
index b5406c7359599b530e2910b44b48eb6bad1bb332..0b91b345f0fe89b393f825f7e81949659e0cced6 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);
@@
-217,6
+220,7
@@
static int internal_dev_destroy(struct vport *vport)
dev_set_promiscuity(netdev_vport->dev, -1);
unregister_netdevice(netdev_vport->dev);
dev_set_promiscuity(netdev_vport->dev, -1);
unregister_netdevice(netdev_vport->dev);
+ /* unregister_netdevice() waits for an RCU grace period. */
vport_free(vport);
return 0;
vport_free(vport);
return 0;
@@
-227,8
+231,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);