diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2016-11-16 22:07:36 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2016-11-16 22:07:36 +0100 |
| commit | 813ae37e6aed72cc457094b6066aa38efd66c9e9 (patch) | |
| tree | 8eb38e60d52feb2bb0cd022a434e80de53914719 /net/tipc/node.c | |
| parent | 6314a17fec5cab4784a5cbb75e816b15e3d22e3e (diff) | |
| parent | 47bdf3378d62a627cfb8a54e1180c08d67078b61 (diff) | |
| download | op-kernel-dev-813ae37e6aed72cc457094b6066aa38efd66c9e9.zip op-kernel-dev-813ae37e6aed72cc457094b6066aa38efd66c9e9.tar.gz | |
Merge branch 'x86/cpufeature' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into kvm/next
Topic branch for AVX512_4VNNIW and AVX512_4FMAPS support in KVM.
Diffstat (limited to 'net/tipc/node.c')
| -rw-r--r-- | net/tipc/node.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 7ef14e2..9d2f4c2 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c @@ -1535,7 +1535,7 @@ void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b) if (unlikely(usr == LINK_PROTOCOL)) tipc_node_bc_sync_rcv(n, hdr, bearer_id, &xmitq); else if (unlikely(tipc_link_acked(n->bc_entry.link) != bc_ack)) - tipc_bcast_ack_rcv(net, n->bc_entry.link, bc_ack); + tipc_bcast_ack_rcv(net, n->bc_entry.link, hdr); /* Receive packet directly if conditions permit */ tipc_node_read_lock(n); |
