[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>
Showing
- include/linux/dccp.h 0 additions, 4 deletionsinclude/linux/dccp.h
- include/linux/ip.h 1 addition, 0 deletionsinclude/linux/ip.h
- include/linux/tcp.h 1 addition, 2 deletionsinclude/linux/tcp.h
- include/net/inet_connection_sock.h 5 additions, 1 deletioninclude/net/inet_connection_sock.h
- include/net/protocol.h 1 addition, 0 deletionsinclude/net/protocol.h
- net/dccp/diag.c 1 addition, 1 deletionnet/dccp/diag.c
- net/dccp/input.c 1 addition, 1 deletionnet/dccp/input.c
- net/dccp/ipv4.c 7 additions, 5 deletionsnet/dccp/ipv4.c
- net/dccp/ipv6.c 14 additions, 12 deletionsnet/dccp/ipv6.c
- net/dccp/output.c 4 additions, 3 deletionsnet/dccp/output.c
- net/dccp/proto.c 1 addition, 1 deletionnet/dccp/proto.c
- net/ipv4/af_inet.c 3 additions, 1 deletionnet/ipv4/af_inet.c
- net/ipv4/ip_sockglue.c 6 additions, 7 deletionsnet/ipv4/ip_sockglue.c
- net/ipv4/tcp.c 1 addition, 1 deletionnet/ipv4/tcp.c
- net/ipv4/tcp_input.c 4 additions, 6 deletionsnet/ipv4/tcp_input.c
- net/ipv4/tcp_ipv4.c 6 additions, 6 deletionsnet/ipv4/tcp_ipv4.c
- net/ipv4/tcp_output.c 10 additions, 8 deletionsnet/ipv4/tcp_output.c
- net/ipv6/af_inet6.c 1 addition, 0 deletionsnet/ipv6/af_inet6.c
- net/ipv6/ipv6_sockglue.c 13 additions, 11 deletionsnet/ipv6/ipv6_sockglue.c
- net/ipv6/tcp_ipv6.c 17 additions, 13 deletionsnet/ipv6/tcp_ipv6.c
Loading
Please register or sign in to comment