diff options
author | Gao Feng <gfree.wind@vip.163.com> | 2017-07-17 18:34:42 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-07-18 11:20:33 -0700 |
commit | e5dadc65f9e0177eb649bcd9d333f1ebf871223e (patch) | |
tree | 3bda78ff436360497a70f52a51668355b0693138 /net | |
parent | df39a9f106d53532443a804352894480ca6ca5fd (diff) | |
download | linux-stable-e5dadc65f9e0177eb649bcd9d333f1ebf871223e.tar.gz linux-stable-e5dadc65f9e0177eb649bcd9d333f1ebf871223e.tar.bz2 linux-stable-e5dadc65f9e0177eb649bcd9d333f1ebf871223e.zip |
ppp: Fix false xmit recursion detect with two ppp devices
The global percpu variable ppp_xmit_recursion is used to detect the ppp
xmit recursion to avoid the deadlock, which is caused by one CPU tries to
lock the xmit lock twice. But it would report false recursion when one CPU
wants to send the skb from two different PPP devices, like one L2TP on the
PPPoE. It is a normal case actually.
Now use one percpu member of struct ppp instead of the gloable variable to
detect the xmit recursion of one ppp device.
Fixes: 55454a565836 ("ppp: avoid dealock on recursive xmit")
Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
Signed-off-by: Liu Jianying <jianying.liu@ikuai8.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions