Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / net / tipc / msg.h

diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 1c8c8dd32a4e98c6326041e210dd14c216c398aa..0daa6f04ca812cfc378b211909a48af77f9739c1 100644 (file)
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -102,13 +102,15 @@ struct plist;
 #define TIPC_MEDIA_INFO_OFFSET 5
 
 struct tipc_skb_cb {
-       u32 bytes_read;
-       u32 orig_member;
        struct sk_buff *tail;
        unsigned long nxt_retr;
-       bool validated;
+       unsigned long retr_stamp;
+       u32 bytes_read;
+       u32 orig_member;
        u16 chain_imp;
        u16 ackers;
+       u16 retr_cnt;
+       bool validated;
 };
 
 #define TIPC_SKB_CB(__skb) ((struct tipc_skb_cb *)&((__skb)->cb[0]))