diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-25 14:05:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-25 14:05:56 -0400 |
| commit | 8fa38a38ac37a0ca5366cd62ba4339c2bab49db9 (patch) | |
| tree | a53fedc6a39f617600e4aebf4957d67195d7a37a /net/tipc/bcast.c | |
| parent | b06b107a4c190299e9e3f8dbcccfc7fe9e10c8cb (diff) | |
| parent | 8b4ed8634f8b3f9aacfc42b4a872d30c36b9e255 (diff) | |
Merge branch 'tipc-next'
Jon Maloy says:
====================
tipc: some improvements and fixes
We introduce a better algorithm for selecting when and which
users should be subject to link congestion control, plus clean
up some code for that mechanism.
Commit #3 fixes another rare race condition during packet reception.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/bcast.c')
| -rw-r--r-- | net/tipc/bcast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 52307397e0b1..79355531c3e2 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -831,7 +831,7 @@ int tipc_nl_add_bc_link(struct net *net, struct tipc_nl_msg *msg) prop = nla_nest_start(msg->skb, TIPC_NLA_LINK_PROP); if (!prop) goto attr_msg_full; - if (nla_put_u32(msg->skb, TIPC_NLA_PROP_WIN, bcl->queue_limit[0])) + if (nla_put_u32(msg->skb, TIPC_NLA_PROP_WIN, bcl->window)) goto prop_msg_full; nla_nest_end(msg->skb, prop); |