diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-30 00:54:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-30 00:54:02 -0400 |
| commit | 6abdd5f5935fff978f950561f3c5175eb34dad73 (patch) | |
| tree | 6f3ed3a4f4af9e74436ec9355ebf8201357f1c40 /net/tipc/udp_media.c | |
| parent | 0b498a52778368ff501557d68c7b50878ab1701e (diff) | |
| parent | e4e98c460ad38c78498622a164fd5ef09a2dc9cb (diff) | |
| download | blackbird-obmc-linux-6abdd5f5935fff978f950561f3c5175eb34dad73.tar.gz blackbird-obmc-linux-6abdd5f5935fff978f950561f3c5175eb34dad73.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All three conflicts were cases of simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/udp_media.c')
| -rw-r--r-- | net/tipc/udp_media.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index 245e9a2eac41..dd274687a53d 100644 --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c @@ -732,6 +732,8 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b, return 0; err: + if (ub->ubsock) + udp_tunnel_sock_release(ub->ubsock); kfree(ub); return err; } |
