diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-23 11:50:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-23 11:50:34 -0400 |
| commit | 37a06a87f20d93c2cec3db9aaf0360a322b703dd (patch) | |
| tree | 4d84c6e1de1a3edb94f21d9730b9c23fc31eb7c8 /net/tipc/socket.c | |
| parent | 4fce14820c1b0a3fd399719f970e0c3ae40dd270 (diff) | |
| parent | 73a317377303b5ec14d4703d73ba87efffbb779d (diff) | |
Merge branch 'tipc-fixes'
Jon Maloy says:
====================
tipc: three bug fixes
A set of unrelated corrections; one for the tipc netns implementation,
one regarding problems with random link resets, and one removing a
an erroneous refcount decrement when reading link statistsics via
netlink.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index ee90d74d7516..9074b5cede38 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1764,13 +1764,14 @@ static int tipc_sk_enqueue(struct sk_buff_head *inputq, struct sock *sk, int tipc_sk_rcv(struct net *net, struct sk_buff_head *inputq) { u32 dnode, dport = 0; - int err = -TIPC_ERR_NO_PORT; + int err; struct sk_buff *skb; struct tipc_sock *tsk; struct tipc_net *tn; struct sock *sk; while (skb_queue_len(inputq)) { + err = -TIPC_ERR_NO_PORT; skb = NULL; dport = tipc_skb_peek_port(inputq, dport); tsk = tipc_sk_lookup(net, dport); |