diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-26 16:31:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-26 16:31:50 -0700 |
| commit | 1d70ec70ef3b5e3e5536d21d8fc82b25aba62d97 (patch) | |
| tree | a76895b3294564437b327e95dd1742daebbd56a9 /net/tipc/msg.h | |
| parent | a69e5a0dcfa4ea3e92b3cc0f17a39f1d88045c11 (diff) | |
| parent | cda3696d3d26eb798c94de0dab5bd66ddb5627cb (diff) | |
Merge branch 'tipc'
Jon Maloy says:
====================
tipc: clean up socket message reception
Despite recent improvements the message reception code in socket.c is
perceived as obscure and hard to follow, especially regarding the logics
for message rejection. With the commits in this series we try to remedy
this situation.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/msg.h')
| -rw-r--r-- | net/tipc/msg.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/tipc/msg.h b/net/tipc/msg.h index 2f1563b47e24..234fb0531d1d 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h @@ -785,8 +785,7 @@ static inline bool msg_peer_is_up(struct tipc_msg *m) struct sk_buff *tipc_buf_acquire(u32 size); bool tipc_msg_validate(struct sk_buff *skb); -bool tipc_msg_reverse(u32 own_addr, struct sk_buff *buf, u32 *dnode, - int err); +bool tipc_msg_reverse(u32 own_addr, struct sk_buff **skb, int err); void tipc_msg_init(u32 own_addr, struct tipc_msg *m, u32 user, u32 type, u32 hsize, u32 destnode); struct sk_buff *tipc_msg_create(uint user, uint type, uint hdr_sz, @@ -799,8 +798,7 @@ bool tipc_msg_make_bundle(struct sk_buff **skb, struct tipc_msg *msg, bool tipc_msg_extract(struct sk_buff *skb, struct sk_buff **iskb, int *pos); int tipc_msg_build(struct tipc_msg *mhdr, struct msghdr *m, int offset, int dsz, int mtu, struct sk_buff_head *list); -bool tipc_msg_lookup_dest(struct net *net, struct sk_buff *skb, u32 *dnode, - int *err); +bool tipc_msg_lookup_dest(struct net *net, struct sk_buff *skb, int *err); struct sk_buff *tipc_msg_reassemble(struct sk_buff_head *list); static inline u16 buf_seqno(struct sk_buff *skb) |