From: Ulrich Weber <uweber@astaro.com>
Date: Wed, 6 Apr 2011 21:04:49 +0000 (-0700)
Subject: pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev
X-Git-Tag: MMI-PSA29.97-13-9~19990^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ae07b0b221b6ab2edf9e3abd518aec6cd3f1ba66;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 78c0e3c9b2b5..71b1d8fbc301 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);