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/tcp_ipv6.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/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index f10f3689d671..0f7defb482e9 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -56,7 +56,6 @@ | |||
| 56 | #include <net/inet_ecn.h> | 56 | #include <net/inet_ecn.h> |
| 57 | #include <net/protocol.h> | 57 | #include <net/protocol.h> |
| 58 | #include <net/xfrm.h> | 58 | #include <net/xfrm.h> |
| 59 | #include <net/addrconf.h> | ||
| 60 | #include <net/snmp.h> | 59 | #include <net/snmp.h> |
| 61 | #include <net/dsfield.h> | 60 | #include <net/dsfield.h> |
| 62 | #include <net/timewait_sock.h> | 61 | #include <net/timewait_sock.h> |
| @@ -2115,7 +2114,6 @@ struct proto tcpv6_prot = { | |||
| 2115 | .shutdown = tcp_shutdown, | 2114 | .shutdown = tcp_shutdown, |
| 2116 | .setsockopt = tcp_setsockopt, | 2115 | .setsockopt = tcp_setsockopt, |
| 2117 | .getsockopt = tcp_getsockopt, | 2116 | .getsockopt = tcp_getsockopt, |
| 2118 | .sendmsg = tcp_sendmsg, | ||
| 2119 | .recvmsg = tcp_recvmsg, | 2117 | .recvmsg = tcp_recvmsg, |
| 2120 | .backlog_rcv = tcp_v6_do_rcv, | 2118 | .backlog_rcv = tcp_v6_do_rcv, |
| 2121 | .hash = tcp_v6_hash, | 2119 | .hash = tcp_v6_hash, |