diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-19 07:27:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-19 07:27:45 -0700 |
| commit | 375db4810b27306ea400ab39d3d6f7a063ac9ff6 (patch) | |
| tree | f2cb778036dbfcade394c9e5ad94a69137fd352c /drivers/net/wan/hdlc_ppp.c | |
| parent | 73c6c7fbb74d07a80fee41ce4ca3976547519e42 (diff) | |
| parent | b91ecb0027c7171c83d7cf443a22c39b1fde6d83 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
gigaset: include cleanup cleanup
packet : remove init_net restriction
WAN: flush tx_queue in hdlc_ppp to prevent panic on rmmod hw_driver.
ip: Fix ip_dev_loopback_xmit()
net: dev_pick_tx() fix
fib: suppress lockdep-RCU false positive in FIB trie.
tun: orphan an skb on tx
forcedeth: fix tx limit2 flag check
iwlwifi: work around bogus active chains detection
Diffstat (limited to 'drivers/net/wan/hdlc_ppp.c')
| -rw-r--r-- | drivers/net/wan/hdlc_ppp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c index b9b9d6b01c0b..941f053e650e 100644 --- a/drivers/net/wan/hdlc_ppp.c +++ b/drivers/net/wan/hdlc_ppp.c @@ -628,9 +628,15 @@ static void ppp_stop(struct net_device *dev) ppp_cp_event(dev, PID_LCP, STOP, 0, 0, 0, NULL); } +static void ppp_close(struct net_device *dev) +{ + ppp_tx_flush(); +} + static struct hdlc_proto proto = { .start = ppp_start, .stop = ppp_stop, + .close = ppp_close, .type_trans = ppp_type_trans, .ioctl = ppp_ioctl, .netif_rx = ppp_rx, |