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 branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into...
[firefly-linux-kernel-4.4.55.git]
/
net
/
openvswitch
/
datapath.h
diff --git
a/net/openvswitch/datapath.h
b/net/openvswitch/datapath.h
index f88038a99f4442bb753b4fc0cb3cc6c05c2bc2fc..67bdecd9fdc1f2b0544c2081aa1a557b16e0063a 100644
(file)
--- a/
net/openvswitch/datapath.h
+++ b/
net/openvswitch/datapath.h
@@
-117,7
+117,6
@@
struct ovs_skb_cb {
*/
struct dp_upcall_info {
struct ip_tunnel_info *egress_tun_info;
- const void *egress_tun_opts;
const struct nlattr *userdata;
const struct nlattr *actions;
int actions_len;