diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-07 14:05:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-07 14:05:23 -0700 |
| commit | c1e48efc701b79ee4367c9a1a4e8bbc7c3586e02 (patch) | |
| tree | 91921f7c0884813c72993fcd2ecd37dc5e56d89d /drivers/net/pppoe.c | |
| parent | 912d398d28b4359c2fb1f3763f1ce4f86de8350e (diff) | |
| parent | 1b86a58f9d7ce4fe2377687f378fbfb53bdc9b6c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/benet/be_main.c
Diffstat (limited to 'drivers/net/pppoe.c')
| -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); |