git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "master" into "wdp".
[sliver-openvswitch.git]
/
datapath
/
vport-internal_dev.c
diff --git
a/datapath/vport-internal_dev.c
b/datapath/vport-internal_dev.c
index
f37d20a
..
16ba64d
100644
(file)
--- a/
datapath/vport-internal_dev.c
+++ b/
datapath/vport-internal_dev.c
@@
-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);
skb_reset_mac_header(skb);
compute_ip_summed(skb, true);
+ OVS_CB(skb)->flow = NULL;
vport_receive(vport, skb);
vport_receive(vport, skb);
@@
-293,7
+294,7
@@
static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
struct vport_ops internal_vport_ops = {
.type = "internal",
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,
.create = internal_dev_create,
.destroy = internal_dev_destroy,
.attach = internal_dev_attach,