add chaos_calmer branch
[15.05/openwrt.git] / target / linux / generic / patches-4.0 / 100-pppoe-drop-pppoe-device-in-pppoe_unbind_sock_work.patch
1 From: Felix Fietkau <nbd@openwrt.org>
2 Date: Sat, 9 May 2015 23:03:47 +0200
3 Subject: [PATCH] pppoe: drop pppoe device in pppoe_unbind_sock_work
4
5 After receiving a PADT and the socket is closed, user space will no
6 longer drop the reference to the pppoe device.
7 This leads to errors like this:
8
9 [  488.570000] unregister_netdevice: waiting for eth0.2 to become free. Usage count = 2
10
11 Fixes: 287f3a943fe ("pppoe: Use workqueue to die properly when a PADT is received")
12 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
13 ---
14
15 --- a/drivers/net/ppp/pppoe.c
16 +++ b/drivers/net/ppp/pppoe.c
17 @@ -462,6 +462,10 @@ static void pppoe_unbind_sock_work(struc
18         struct sock *sk = sk_pppox(po);
19  
20         lock_sock(sk);
21 +       if (po->pppoe_dev) {
22 +               dev_put(po->pppoe_dev);
23 +               po->pppoe_dev = NULL;
24 +       }
25         pppox_unbind_sock(sk);
26         release_sock(sk);
27         sock_put(sk);