diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-17 05:21:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-17 05:21:24 +0200 |
| commit | da8120355e80ddaf534adb8ed910871d97512d56 (patch) | |
| tree | 9958a6c33e29b5af5faccf6650e98729151618a2 /net/ipv6/ip6_output.c | |
| parent | gianfar: remove unused DECLARE_MAC_BUF (diff) | |
| parent | cdc-eem: bad crc checking (diff) | |
| download | linux-da8120355e80ddaf534adb8ed910871d97512d56.tar.xz linux-da8120355e80ddaf534adb8ed910871d97512d56.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/orinoco/main.c
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index dd1a980b8ac9..93beee944657 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1474,7 +1474,6 @@ int ip6_push_pending_frames(struct sock *sk) skb->len += tmp_skb->len; skb->data_len += tmp_skb->len; skb->truesize += tmp_skb->truesize; - __sock_put(tmp_skb->sk); tmp_skb->destructor = NULL; tmp_skb->sk = NULL; } |