diff options
Diffstat (limited to 'net/openvswitch/datapath.h')
-rw-r--r-- | net/openvswitch/datapath.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h index cd691e935e08..6b28c5cedb23 100644 --- a/net/openvswitch/datapath.h +++ b/net/openvswitch/datapath.h | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/netdevice.h> | 25 | #include <linux/netdevice.h> |
26 | #include <linux/skbuff.h> | 26 | #include <linux/skbuff.h> |
27 | #include <linux/u64_stats_sync.h> | 27 | #include <linux/u64_stats_sync.h> |
28 | #include <net/ip_tunnels.h> | ||
28 | 29 | ||
29 | #include "flow.h" | 30 | #include "flow.h" |
30 | #include "flow_table.h" | 31 | #include "flow_table.h" |
@@ -98,7 +99,7 @@ struct datapath { | |||
98 | * when a packet is received by OVS. | 99 | * when a packet is received by OVS. |
99 | */ | 100 | */ |
100 | struct ovs_skb_cb { | 101 | struct ovs_skb_cb { |
101 | struct ovs_tunnel_info *egress_tun_info; | 102 | struct ip_tunnel_info *egress_tun_info; |
102 | struct vport *input_vport; | 103 | struct vport *input_vport; |
103 | }; | 104 | }; |
104 | #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb) | 105 | #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb) |
@@ -114,7 +115,7 @@ struct ovs_skb_cb { | |||
114 | * @egress_tun_info: If nonnull, becomes %OVS_PACKET_ATTR_EGRESS_TUN_KEY. | 115 | * @egress_tun_info: If nonnull, becomes %OVS_PACKET_ATTR_EGRESS_TUN_KEY. |
115 | */ | 116 | */ |
116 | struct dp_upcall_info { | 117 | struct dp_upcall_info { |
117 | const struct ovs_tunnel_info *egress_tun_info; | 118 | const struct ip_tunnel_info *egress_tun_info; |
118 | const struct nlattr *userdata; | 119 | const struct nlattr *userdata; |
119 | const struct nlattr *actions; | 120 | const struct nlattr *actions; |
120 | int actions_len; | 121 | int actions_len; |