diff options
author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-11 10:34:03 -0600 |
---|---|---|
committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-11 10:34:03 -0600 |
commit | febbb25c8856bfe03e2a06b3f88e69f7d9d10b81 (patch) | |
tree | b89154f29c52cf14fcef442ea4df3164e62dd7a6 /net/l2tp/l2tp_ppp.c | |
parent | 5765ecb5ef2401f7bd0feaeeadbe6dbc558b9791 (diff) | |
parent | 4e77f7f1261f65cff06918bc5e66d02a418fc842 (diff) |
Merge tag 'v3.10.18' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-3.10.18-2013.11
This is the 3.10.18 stable release
Diffstat (limited to 'net/l2tp/l2tp_ppp.c')
-rw-r--r-- | net/l2tp/l2tp_ppp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 5ebee2ded9e9..8c46b271064a 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -353,7 +353,9 @@ static int pppol2tp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msgh goto error_put_sess_tun; } + local_bh_disable(); l2tp_xmit_skb(session, skb, session->hdr_len); + local_bh_enable(); sock_put(ps->tunnel_sock); sock_put(sk); @@ -422,7 +424,9 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb) skb->data[0] = ppph[0]; skb->data[1] = ppph[1]; + local_bh_disable(); l2tp_xmit_skb(session, skb, session->hdr_len); + local_bh_enable(); sock_put(sk_tun); sock_put(sk); |