projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://www.linux-watchdog.org/linux-watchdog
[firefly-linux-kernel-4.4.55.git]
/
net
/
openvswitch
/
vport-gre.c
diff --git
a/net/openvswitch/vport-gre.c
b/net/openvswitch/vport-gre.c
index 871801d2ac23e82a26f09f22e13e71797dc9a603..4d24481669c95197b06bb75d207b3e713b433508 100644
(file)
--- a/
net/openvswitch/vport-gre.c
+++ b/
net/openvswitch/vport-gre.c
@@
-85,12
+85,10
@@
static struct vport *gre_create(const struct vport_parms *parms)
}
static int gre_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
}
static int gre_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
- struct
ip_tunnel_info *egress_tun_info
)
+ struct
dp_upcall_info *upcall
)
{
{
- return ovs_tunnel_get_egress_info(egress_tun_info,
- ovs_dp_get_net(vport->dp),
- OVS_CB(skb)->egress_tun_info,
- IPPROTO_GRE, skb->mark, 0, 0);
+ return ovs_tunnel_get_egress_info(upcall, ovs_dp_get_net(vport->dp),
+ skb, IPPROTO_GRE, 0, 0);
}
static struct vport_ops ovs_gre_vport_ops = {
}
static struct vport_ops ovs_gre_vport_ops = {