diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-16 00:53:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-16 00:53:25 -0400 |
| commit | a9653cf540d407fb75deb3db65a1be6c81d53ee0 (patch) | |
| tree | 075fb79746f1d74443c9a9062e73c26a6266b05c /net/ipv6/raw.c | |
| parent | e80ac32767d0f781ac195c472d500a7451d3729a (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'net/ipv6/raw.c')
| -rw-r--r-- | net/ipv6/raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 8fee9a15b2d3..3aee12310d94 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
| @@ -1169,7 +1169,8 @@ static int raw6_destroy(struct sock *sk) | |||
| 1169 | lock_sock(sk); | 1169 | lock_sock(sk); |
| 1170 | ip6_flush_pending_frames(sk); | 1170 | ip6_flush_pending_frames(sk); |
| 1171 | release_sock(sk); | 1171 | release_sock(sk); |
| 1172 | return 0; | 1172 | |
| 1173 | return inet6_destroy_sock(sk); | ||
| 1173 | } | 1174 | } |
| 1174 | 1175 | ||
| 1175 | static int rawv6_init_sk(struct sock *sk) | 1176 | static int rawv6_init_sk(struct sock *sk) |
| @@ -1200,7 +1201,6 @@ struct proto rawv6_prot = { | |||
| 1200 | .disconnect = udp_disconnect, | 1201 | .disconnect = udp_disconnect, |
| 1201 | .ioctl = rawv6_ioctl, | 1202 | .ioctl = rawv6_ioctl, |
| 1202 | .init = rawv6_init_sk, | 1203 | .init = rawv6_init_sk, |
| 1203 | .destroy = inet6_destroy_sock, | ||
| 1204 | .setsockopt = rawv6_setsockopt, | 1204 | .setsockopt = rawv6_setsockopt, |
| 1205 | .getsockopt = rawv6_getsockopt, | 1205 | .getsockopt = rawv6_getsockopt, |
| 1206 | .sendmsg = rawv6_sendmsg, | 1206 | .sendmsg = rawv6_sendmsg, |