diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-16 08:11:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-16 08:11:14 +0100 |
| commit | b26e478f8fd5b575684f021b05a5c6236ebb911a (patch) | |
| tree | 27d3b3eaf3fe10d05319ad3395b2569ad5f8f6d0 /drivers/net/ppp | |
| parent | tg3: Break out RSS indir table init and assignment (diff) | |
| parent | ipv6: Check dest prefix length on original route not copied one in rt6_alloc_... (diff) | |
| download | linux-b26e478f8fd5b575684f021b05a5c6236ebb911a.tar.xz linux-b26e478f8fd5b575684f021b05a5c6236ebb911a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
net/batman-adv/translation-table.c
net/ipv6/route.c
Diffstat (limited to 'drivers/net/ppp')
| -rw-r--r-- | drivers/net/ppp/pptp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c index ede899ca0ee6..c1c9293c2bbf 100644 --- a/drivers/net/ppp/pptp.c +++ b/drivers/net/ppp/pptp.c @@ -423,10 +423,8 @@ static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr, lock_sock(sk); opt->src_addr = sp->sa_addr.pptp; - if (add_chan(po)) { - release_sock(sk); + if (add_chan(po)) error = -EBUSY; - } release_sock(sk); return error; |