diff options
| author | Ulrich Weber <uweber@astaro.com> | 2011-04-06 14:04:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-21 14:32:28 -0700 |
| commit | 215f7206f540704ead83838eacef25ec13b763fb (patch) | |
| tree | 9633ffc6b0a06cffe10e68939e63baea5d70722c | |
| parent | 5d0fad1c60f42b4578ddbfd2ec54216f2f2155fc (diff) | |
pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev
[ Upstream commit ae07b0b221b6ab2edf9e3abd518aec6cd3f1ba66 ]
otherwise we loop forever if a PPPoE socket was set
to PPPOX_ZOMBIE state by a PADT message when the
ethernet device is going down afterwards.
Signed-off-by: Ulrich Weber <uweber@astaro.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/net/pppoe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 78c0e3c9b2b..71b1d8fbc30 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c @@ -317,7 +317,7 @@ static void pppoe_flush_dev(struct net_device *dev) lock_sock(sk); if (po->pppoe_dev == dev && - sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) { + sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) { pppox_unbind_sock(sk); sk->sk_state = PPPOX_ZOMBIE; sk->sk_state_change(sk); |