git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
[pandora-kernel.git]
/
drivers
/
net
/
pppoe.c
diff --git
a/drivers/net/pppoe.c
b/drivers/net/pppoe.c
index
693aaef
..
718879b
100644
(file)
--- 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);