diff options
Diffstat (limited to 'net/tipc/msg.h')
-rw-r--r-- | net/tipc/msg.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/tipc/msg.h b/net/tipc/msg.h index 2c3dc38abf9c..c843fd2bc48d 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h | |||
@@ -98,8 +98,6 @@ struct tipc_skb_cb { | |||
98 | u32 bytes_read; | 98 | u32 bytes_read; |
99 | struct sk_buff *tail; | 99 | struct sk_buff *tail; |
100 | bool validated; | 100 | bool validated; |
101 | bool wakeup_pending; | ||
102 | u16 chain_sz; | ||
103 | u16 chain_imp; | 101 | u16 chain_imp; |
104 | u16 ackers; | 102 | u16 ackers; |
105 | }; | 103 | }; |
@@ -633,14 +631,11 @@ static inline void msg_set_bc_netid(struct tipc_msg *m, u32 id) | |||
633 | 631 | ||
634 | static inline u32 msg_link_selector(struct tipc_msg *m) | 632 | static inline u32 msg_link_selector(struct tipc_msg *m) |
635 | { | 633 | { |
634 | if (msg_user(m) == MSG_FRAGMENTER) | ||
635 | m = (void *)msg_data(m); | ||
636 | return msg_bits(m, 4, 0, 1); | 636 | return msg_bits(m, 4, 0, 1); |
637 | } | 637 | } |
638 | 638 | ||
639 | static inline void msg_set_link_selector(struct tipc_msg *m, u32 n) | ||
640 | { | ||
641 | msg_set_bits(m, 4, 0, 1, n); | ||
642 | } | ||
643 | |||
644 | /* | 639 | /* |
645 | * Word 5 | 640 | * Word 5 |
646 | */ | 641 | */ |
@@ -837,6 +832,8 @@ int tipc_msg_build(struct tipc_msg *mhdr, struct msghdr *m, | |||
837 | int offset, int dsz, int mtu, struct sk_buff_head *list); | 832 | int offset, int dsz, int mtu, struct sk_buff_head *list); |
838 | bool tipc_msg_lookup_dest(struct net *net, struct sk_buff *skb, int *err); | 833 | bool tipc_msg_lookup_dest(struct net *net, struct sk_buff *skb, int *err); |
839 | bool tipc_msg_reassemble(struct sk_buff_head *list, struct sk_buff_head *rcvq); | 834 | bool tipc_msg_reassemble(struct sk_buff_head *list, struct sk_buff_head *rcvq); |
835 | bool tipc_msg_pskb_copy(u32 dst, struct sk_buff_head *msg, | ||
836 | struct sk_buff_head *cpy); | ||
840 | void __tipc_skb_queue_sorted(struct sk_buff_head *list, u16 seqno, | 837 | void __tipc_skb_queue_sorted(struct sk_buff_head *list, u16 seqno, |
841 | struct sk_buff *skb); | 838 | struct sk_buff *skb); |
842 | 839 | ||