diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-20 18:25:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-20 18:25:24 -0700 |
| commit | 11fe883936980fe242869d671092a466cf1db3e3 (patch) | |
| tree | 14ff24e81eb4326e94eb5aa6432a1dd55cef5ece /net/phonet | |
| parent | 70d4bf6d467a330ccc947df9b2608e329d9e7708 (diff) | |
| parent | 573201f36fd9c7c6d5218cdcd9948cee700b277d (diff) | |
| download | linux-11fe883936980fe242869d671092a466cf1db3e3.tar.gz linux-11fe883936980fe242869d671092a466cf1db3e3.tar.bz2 linux-11fe883936980fe242869d671092a466cf1db3e3.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/vhost/net.c
net/bridge/br_device.c
Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.
Revert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet')
| -rw-r--r-- | net/phonet/pep.c | 1 |
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; |