diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-01 03:10:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-01 03:24:41 -0400 |
| commit | fb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a (patch) | |
| tree | ea284fe7b9c17a85b8d3c4ba999d6e26d51a12f6 /net/l2tp/l2tp_ppp.c | |
| parent | f9f9ffc237dd924f048204e8799da74f9ecf40cf (diff) | |
| parent | 52469b4fcd4fc433ffc78cec4cf94368e9052890 (diff) | |
Merge branch 'linus' into sched/core
Resolve cherry-picking conflicts:
Conflicts:
mm/huge_memory.c
mm/memory.c
mm/mprotect.c
See this upstream merge commit for more details:
52469b4fcd4f Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 | |||
| 353 | goto error_put_sess_tun; | 353 | goto error_put_sess_tun; |
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | local_bh_disable(); | ||
| 356 | l2tp_xmit_skb(session, skb, session->hdr_len); | 357 | l2tp_xmit_skb(session, skb, session->hdr_len); |
| 358 | local_bh_enable(); | ||
| 357 | 359 | ||
| 358 | sock_put(ps->tunnel_sock); | 360 | sock_put(ps->tunnel_sock); |
| 359 | sock_put(sk); | 361 | sock_put(sk); |
| @@ -422,7 +424,9 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb) | |||
| 422 | skb->data[0] = ppph[0]; | 424 | skb->data[0] = ppph[0]; |
| 423 | skb->data[1] = ppph[1]; | 425 | skb->data[1] = ppph[1]; |
| 424 | 426 | ||
| 427 | local_bh_disable(); | ||
| 425 | l2tp_xmit_skb(session, skb, session->hdr_len); | 428 | l2tp_xmit_skb(session, skb, session->hdr_len); |
| 429 | local_bh_enable(); | ||
| 426 | 430 | ||
| 427 | sock_put(sk_tun); | 431 | sock_put(sk_tun); |
| 428 | sock_put(sk); | 432 | sock_put(sk); |