diff options
Diffstat (limited to 'net/openvswitch/datapath.h')
-rw-r--r-- | net/openvswitch/datapath.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h index 16b840695216..a91486484916 100644 --- a/net/openvswitch/datapath.h +++ b/net/openvswitch/datapath.h | |||
@@ -88,9 +88,12 @@ struct datapath { | |||
88 | /** | 88 | /** |
89 | * struct ovs_skb_cb - OVS data in skb CB | 89 | * struct ovs_skb_cb - OVS data in skb CB |
90 | * @flow: The flow associated with this packet. May be %NULL if no flow. | 90 | * @flow: The flow associated with this packet. May be %NULL if no flow. |
91 | * @tun_key: Key for the tunnel that encapsulated this packet. NULL if the | ||
92 | * packet is not being tunneled. | ||
91 | */ | 93 | */ |
92 | struct ovs_skb_cb { | 94 | struct ovs_skb_cb { |
93 | struct sw_flow *flow; | 95 | struct sw_flow *flow; |
96 | struct ovs_key_ipv4_tunnel *tun_key; | ||
94 | }; | 97 | }; |
95 | #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb) | 98 | #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb) |
96 | 99 | ||
@@ -119,6 +122,7 @@ struct dp_upcall_info { | |||
119 | struct ovs_net { | 122 | struct ovs_net { |
120 | struct list_head dps; | 123 | struct list_head dps; |
121 | struct work_struct dp_notify_work; | 124 | struct work_struct dp_notify_work; |
125 | struct vport_net vport_net; | ||
122 | }; | 126 | }; |
123 | 127 | ||
124 | extern int ovs_net_id; | 128 | extern int ovs_net_id; |