Merge branch 'for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / net / openvswitch / datapath.h

diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
index 4ec4a480b147030c3e2938c4ba612d4e7d5e10be..cd691e935e08c76b75e8ed90d7ec79ce9875ee3c 100644 (file)
--- a/net/openvswitch/datapath.h
+++ b/net/openvswitch/datapath.h
@@ -116,6 +116,8 @@ struct ovs_skb_cb {
 struct dp_upcall_info {
        const struct ovs_tunnel_info *egress_tun_info;
        const struct nlattr *userdata;
+       const struct nlattr *actions;
+       int actions_len;
        u32 portid;
        u8 cmd;
 };