diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-11-11 18:15:22 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-11-11 18:15:22 +0300 |
| commit | a04dae9eb15a2629de75c4ddde44e677a356f93a (patch) | |
| tree | b7e4b1a0983c4882abbdba09107c09836e0ee0f0 /net/tipc/node.c | |
| parent | 4ce8e6a51abfc69bf222f676cfe938f7732385d7 (diff) | |
| parent | f336c3f072216a16187b22069681d014dcb43db6 (diff) | |
| download | linux-a04dae9eb15a2629de75c4ddde44e677a356f93a.tar.xz | |
Merge branch 'topic/restize-docs' into for-next
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 7ef14e2d2356..9d2f4c2b08ab 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); |