Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[deliverable/linux.git] / net / tipc / core.h

diff --git a/net/tipc/core.h b/net/tipc/core.h
index f773b148722f7e51195d525a55e2ae18577c3c3e..84602137ce20f1fe051d7c3ebd2a8fafa10c2b43 100644 (file)
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -41,6 +41,7 @@
 
 #include <linux/tipc.h>
 #include <linux/tipc_config.h>
+#include <linux/tipc_netlink.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -191,6 +192,7 @@ struct tipc_skb_cb {
        struct sk_buff *tail;
        bool deferred;
        bool wakeup_pending;
+       bool bundling;
        u16 chain_sz;
        u16 chain_imp;
 };