diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-12-17 08:48:27 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-12-17 08:48:27 -0800 |
commit | d3d3a134d75d28034b950bc0b6682ba0be976f37 (patch) | |
tree | 71365703ae44c980a80f9b2c02d664cbc3ddd935 /drivers/net/ppp/pppoe.c | |
parent | a143f427f3e7c6d80bc1d288334706a1f8237f5f (diff) | |
parent | 8b20b3796da06d8ada347c4eaf289c3127da155f (diff) |
Merge branch 'v4.1/topic/rt' into linux-linaro-lsk-v4.1-rt
Diffstat (limited to 'drivers/net/ppp/pppoe.c')
-rw-r--r-- | drivers/net/ppp/pppoe.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index b62a5e3a1c65..db2c3cdf2c40 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -313,7 +313,6 @@ static void pppoe_flush_dev(struct net_device *dev) if (po->pppoe_dev == dev && sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) { pppox_unbind_sock(sk); - sk->sk_state = PPPOX_ZOMBIE; sk->sk_state_change(sk); po->pppoe_dev = NULL; dev_put(dev); |