diff options
author | Boris Brezillon <[email protected]> | 2017-08-28 18:04:15 +0200 |
---|---|---|
committer | Boris Brezillon <[email protected]> | 2017-08-28 18:04:15 +0200 |
commit | 5ffa70b2a38befadb920b85fe87f5da2b4cff623 (patch) | |
tree | 411b1d357731db5e2611f0ca67082a8c909b7d9d /net/tipc/msg.c | |
parent | 75864b301c91bf41ec2fb49ce4efb62fcb48b954 (diff) | |
parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) |
Merge tag 'v4.13-rc7' into mtd/next
Merge v4.13-rc7 back to resolve merge conflicts in
drivers/mtd/nand/nandsim.c and include/asm-generic/vmlinux.lds.h.
Diffstat (limited to 'net/tipc/msg.c')
-rw-r--r-- | net/tipc/msg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/msg.c b/net/tipc/msg.c index ab3087687a32..dcd90e6fa7c3 100644 --- a/net/tipc/msg.c +++ b/net/tipc/msg.c @@ -513,6 +513,7 @@ bool tipc_msg_reverse(u32 own_node, struct sk_buff **skb, int err) /* Now reverse the concerned fields */ msg_set_errcode(hdr, err); + msg_set_non_seq(hdr, 0); msg_set_origport(hdr, msg_destport(&ohdr)); msg_set_destport(hdr, msg_origport(&ohdr)); msg_set_destnode(hdr, msg_prevnode(&ohdr)); |