diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-28 22:40:49 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-28 22:40:49 +0400 |
| commit | 6a06e5e1bb217be077e1f8ee2745b4c5b1aa02db (patch) | |
| tree | 8faea23112a11f52524eb413f71b7b02712d8b53 /drivers/net/ppp | |
| parent | d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1 (diff) | |
| parent | 6672d90fe779dc0dfffe027c3ede12609df091c2 (diff) | |
| download | linux-6a06e5e1bb217be077e1f8ee2745b4c5b1aa02db.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/team/team.c
drivers/net/usb/qmi_wwan.c
net/batman-adv/bat_iv_ogm.c
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/l2tp/l2tp_netlink.c
The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.
qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.
With help from Antonio Quartulli.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ppp')
| -rw-r--r-- | drivers/net/ppp/pppoe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index cbf7047decc0..20f31d0d1536 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -570,7 +570,7 @@ static int pppoe_release(struct socket *sock) po = pppox_sk(sk); - if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) { + if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) { dev_put(po->pppoe_dev); po->pppoe_dev = NULL; } |