diff options
author | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /net/ipv6/raw.c | |
parent | 9e4859ef5462193643fd2b3c8ffb298e5a4a4319 (diff) | |
parent | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/ipv6/raw.c')
-rw-r--r-- | net/ipv6/raw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index e27383d855de..77167afa3455 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
@@ -882,11 +882,10 @@ back_from_confirm: | |||
882 | ip6_flush_pending_frames(sk); | 882 | ip6_flush_pending_frames(sk); |
883 | else if (!(msg->msg_flags & MSG_MORE)) | 883 | else if (!(msg->msg_flags & MSG_MORE)) |
884 | err = rawv6_push_pending_frames(sk, &fl, rp); | 884 | err = rawv6_push_pending_frames(sk, &fl, rp); |
885 | release_sock(sk); | ||
885 | } | 886 | } |
886 | done: | 887 | done: |
887 | dst_release(dst); | 888 | dst_release(dst); |
888 | if (!inet->hdrincl) | ||
889 | release_sock(sk); | ||
890 | out: | 889 | out: |
891 | fl6_sock_release(flowlabel); | 890 | fl6_sock_release(flowlabel); |
892 | return err<0?err:len; | 891 | return err<0?err:len; |