Home| summaryrefslogtreecommitdiff |
diff options
| author | Bernhard Walle <bwalle@suse.de> | 2007-10-05 21:32:21 +0000 |
|---|---|---|
| committer | Bernhard Walle <bwalle@suse.de> | 2007-10-05 21:32:21 +0000 |
| commit | 281a8e4b656e3bdbb9afd64409d3f27a87da91c2 (patch) | |
| tree | fc7d445b5e44fb1efbd2a1706749e71ad51c2fd5 | |
| parent | 5988bfcb3fe67fc949ef2459abd59df46b1a0bb6 (diff) | |
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:rpm-2.6.22.9-0.4
Add trampoline function also for IPv6 and fix kernel hang
(331456)
suse-commit: 81fcbb71f724b3fa2ff6a8d5eae7199afd85219e
| -rw-r--r-- | net/ipv6/af_inet6.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index b1a7755162b6..2f640d0acb51 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -472,6 +472,13 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) EXPORT_SYMBOL(inet6_ioctl); +/* KABI safe workaround for 2.6.22.6 tcp_sendmsg change -bwalle, copied from ipv4 */ +static int inet_tcp_sendmsg(struct kiocb *iocb, struct socket *sock, + struct msghdr *msg, size_t size) +{ + return tcp_sendmsg(iocb, sock->sk, msg, size); +} + const struct proto_ops inet6_stream_ops = { .family = PF_INET6, .owner = THIS_MODULE, @@ -487,7 +494,7 @@ const struct proto_ops inet6_stream_ops = { .shutdown = inet_shutdown, /* ok */ .setsockopt = sock_common_setsockopt, /* ok */ .getsockopt = sock_common_getsockopt, /* ok */ - .sendmsg = tcp_sendmsg, /* ok */ + .sendmsg = inet_tcp_sendmsg, /* ok */ .recvmsg = sock_common_recvmsg, /* ok */ .mmap = sock_no_mmap, .sendpage = tcp_sendpage, |