diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-16 23:21:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-16 23:21:24 -0400 |
| commit | da8120355e80ddaf534adb8ed910871d97512d56 (patch) | |
| tree | 9958a6c33e29b5af5faccf6650e98729151618a2 /net/ipv6/ip6_output.c | |
| parent | c86ae82605ef92594a0de809a8c588ae955fed63 (diff) | |
| parent | 7fefe6a88494b00b151b5ca7bb84daaa781bbca7 (diff) | |
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) | |||
| 1474 | skb->len += tmp_skb->len; | 1474 | skb->len += tmp_skb->len; |
| 1475 | skb->data_len += tmp_skb->len; | 1475 | skb->data_len += tmp_skb->len; |
| 1476 | skb->truesize += tmp_skb->truesize; | 1476 | skb->truesize += tmp_skb->truesize; |
| 1477 | __sock_put(tmp_skb->sk); | ||
| 1478 | tmp_skb->destructor = NULL; | 1477 | tmp_skb->destructor = NULL; |
| 1479 | tmp_skb->sk = NULL; | 1478 | tmp_skb->sk = NULL; |
| 1480 | } | 1479 | } |