diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /net/ipv6/af_inet6.c | |
| parent | 68d09b1b6780415d82160f6b6d88e82bd724e691 (diff) | |
| parent | b377fd3982ad957c796758a90e2988401a884241 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/ipv6/af_inet6.c')
| -rw-r--r-- | net/ipv6/af_inet6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index eed09373a45d..b5f96372ad73 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
| @@ -484,7 +484,7 @@ const struct proto_ops inet6_stream_ops = { | |||
| 484 | .shutdown = inet_shutdown, /* ok */ | 484 | .shutdown = inet_shutdown, /* ok */ |
| 485 | .setsockopt = sock_common_setsockopt, /* ok */ | 485 | .setsockopt = sock_common_setsockopt, /* ok */ |
| 486 | .getsockopt = sock_common_getsockopt, /* ok */ | 486 | .getsockopt = sock_common_getsockopt, /* ok */ |
| 487 | .sendmsg = inet_sendmsg, /* ok */ | 487 | .sendmsg = tcp_sendmsg, /* ok */ |
| 488 | .recvmsg = sock_common_recvmsg, /* ok */ | 488 | .recvmsg = sock_common_recvmsg, /* ok */ |
| 489 | .mmap = sock_no_mmap, | 489 | .mmap = sock_no_mmap, |
| 490 | .sendpage = tcp_sendpage, | 490 | .sendpage = tcp_sendpage, |