]> err.no Git - linux-2.6/commit
[IP_SOCKGLUE]: Remove most of the tcp specific calls
authorArnaldo Carvalho de Melo <acme@mandriva.com>
Wed, 14 Dec 2005 07:26:10 +0000 (23:26 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Tue, 3 Jan 2006 21:10:58 +0000 (13:10 -0800)
commitd83d8461f902c672bc1bd8fbc6a94e19f092da97
tree0534c553ab92baa2eb9dbb5bba64f2c4540b1e89
parent22712813620fa8e682dbfb253a60ca0131da1e07
[IP_SOCKGLUE]: Remove most of the tcp specific calls

As DCCP needs to be called in the same spots.

Now we have a member in inet_sock (is_icsk), set at sock creation time from
struct inet_protosw->flags (if INET_PROTOSW_ICSK is set, like for TCP and
DCCP) to see if a struct sock instance is a inet_connection_sock for places
like the ones in ip_sockglue.c (v4 and v6) where we previously were looking if
sk_type was SOCK_STREAM, that is insufficient because we now use the same code
for DCCP, that has sk_type SOCK_DCCP.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
20 files changed:
include/linux/dccp.h
include/linux/ip.h
include/linux/tcp.h
include/net/inet_connection_sock.h
include/net/protocol.h
net/dccp/diag.c
net/dccp/input.c
net/dccp/ipv4.c
net/dccp/ipv6.c
net/dccp/output.c
net/dccp/proto.c
net/ipv4/af_inet.c
net/ipv4/ip_sockglue.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_output.c
net/ipv6/af_inet6.c
net/ipv6/ipv6_sockglue.c
net/ipv6/tcp_ipv6.c