diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-11-30 09:32:51 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-11-30 09:32:51 -0800 |
| commit | caf91bc186175f0005ed77295f1acd52c6aeca47 (patch) | |
| tree | 2d677532ced4fa21667b8cbe83dfb37c15afab71 /drivers/net/ppp/pppoe.c | |
| parent | c6df33694dbe813e34da1f893cbc08a5822a26d7 (diff) | |
| parent | de862fe2cd3432b1d1acb0b570a33dbdd02bf4a1 (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android
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 becfa3ef7fdc..eda9f3d87746 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); |