diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /drivers/net/ppp_generic.c | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/net/ppp_generic.c')
| -rw-r--r-- | drivers/net/ppp_generic.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 11b575f89856..ef58e4128782 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
| @@ -2544,6 +2544,9 @@ static void ppp_destroy_interface(struct ppp *ppp) | |||
| 2544 | ppp->active_filter = NULL; | 2544 | ppp->active_filter = NULL; |
| 2545 | #endif /* CONFIG_PPP_FILTER */ | 2545 | #endif /* CONFIG_PPP_FILTER */ |
| 2546 | 2546 | ||
| 2547 | if (ppp->xmit_pending) | ||
| 2548 | kfree_skb(ppp->xmit_pending); | ||
| 2549 | |||
| 2547 | kfree(ppp); | 2550 | kfree(ppp); |
| 2548 | } | 2551 | } |
| 2549 | 2552 | ||