summaryrefslogtreecommitdiffstats
path: root/net/phonet/pep.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-07-25 17:52:21 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-07-25 17:52:21 -0600
commit5ffdcd94ea0171cf9a3ca63051c2246426103b5b (patch)
treedfa1522796d5af649caf64ac6e2f1e69119e85d0 /net/phonet/pep.c
parentcf40f082f8d3a98e28af02af20d00d2500eb6a65 (diff)
parentb37fa16e78d6f9790462b3181602a26b5af36260 (diff)
downloadlinux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.tar.gz
linux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.tar.bz2
linux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.zip
Merge commit 'v2.6.35-rc6' into spi/test
Diffstat (limited to 'net/phonet/pep.c')
-rw-r--r--net/phonet/pep.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/phonet/pep.c b/net/phonet/pep.c
index 94d72e85a475..b2a3ae6cad78 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -698,6 +698,7 @@ static struct sock *pep_sock_accept(struct sock *sk, int flags, int *errp)
newsk = NULL;
goto out;
}
+ kfree_skb(oskb);
sock_hold(sk);
pep_sk(newsk)->listener = sk;