summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrich Weber <uweber@astaro.com>2011-04-06 14:04:49 -0700
committerDavid S. Miller <davem@davemloft.net>2011-04-06 14:04:49 -0700
commitae07b0b221b6ab2edf9e3abd518aec6cd3f1ba66 (patch)
tree02eeecf84b1499ddd5eb8124f65e003ed7074a41
parenta25a32ab71f822efb3e6025c365caa678aa6ff3b (diff)
downloadop-kernel-dev-ae07b0b221b6ab2edf9e3abd518aec6cd3f1ba66.zip
op-kernel-dev-ae07b0b221b6ab2edf9e3abd518aec6cd3f1ba66.tar.gz
pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev
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>
-rw-r--r--drivers/net/pppoe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 78c0e3c..71b1d8f 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);
OpenPOWER on IntegriCloud