aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/tcp.h
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@ghostprotocols.net>2005-06-19 01:47:21 -0400
committerDavid S. Miller <davem@davemloft.net>2005-06-19 01:47:21 -0400
commit60236fdd08b2169045a3bbfc5ffe1576e6c3c17b (patch)
tree4541c682cc72daf560ec516e2b5868089a88b6ea /include/net/tcp.h
parent2e6599cb899ba4b133f42cbf9d2b1883d2dc583a (diff)
[NET] Rename open_request to request_sock
Ok, this one just renames some stuff to have a better namespace and to dissassociate it from TCP: struct open_request -> struct request_sock tcp_openreq_alloc -> reqsk_alloc tcp_openreq_free -> reqsk_free tcp_openreq_fastfree -> __reqsk_free With this most of the infrastructure closely resembles a struct sock methods subset. Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tcp.h')
-rw-r--r--include/net/tcp.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index d438ba566b89..6663086a5e35 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -641,7 +641,7 @@ struct tcp_func {
641 641
642 struct sock * (*syn_recv_sock) (struct sock *sk, 642 struct sock * (*syn_recv_sock) (struct sock *sk,
643 struct sk_buff *skb, 643 struct sk_buff *skb,
644 struct open_request *req, 644 struct request_sock *req,
645 struct dst_entry *dst); 645 struct dst_entry *dst);
646 646
647 int (*remember_stamp) (struct sock *sk); 647 int (*remember_stamp) (struct sock *sk);
@@ -785,8 +785,8 @@ extern enum tcp_tw_status tcp_timewait_state_process(struct tcp_tw_bucket *tw,
785 unsigned len); 785 unsigned len);
786 786
787extern struct sock * tcp_check_req(struct sock *sk,struct sk_buff *skb, 787extern struct sock * tcp_check_req(struct sock *sk,struct sk_buff *skb,
788 struct open_request *req, 788 struct request_sock *req,
789 struct open_request **prev); 789 struct request_sock **prev);
790extern int tcp_child_process(struct sock *parent, 790extern int tcp_child_process(struct sock *parent,
791 struct sock *child, 791 struct sock *child,
792 struct sk_buff *skb); 792 struct sk_buff *skb);
@@ -836,12 +836,12 @@ extern int tcp_v4_conn_request(struct sock *sk,
836 struct sk_buff *skb); 836 struct sk_buff *skb);
837 837
838extern struct sock * tcp_create_openreq_child(struct sock *sk, 838extern struct sock * tcp_create_openreq_child(struct sock *sk,
839 struct open_request *req, 839 struct request_sock *req,
840 struct sk_buff *skb); 840 struct sk_buff *skb);
841 841
842extern struct sock * tcp_v4_syn_recv_sock(struct sock *sk, 842extern struct sock * tcp_v4_syn_recv_sock(struct sock *sk,
843 struct sk_buff *skb, 843 struct sk_buff *skb,
844 struct open_request *req, 844 struct request_sock *req,
845 struct dst_entry *dst); 845 struct dst_entry *dst);
846 846
847extern int tcp_v4_do_rcv(struct sock *sk, 847extern int tcp_v4_do_rcv(struct sock *sk,
@@ -855,7 +855,7 @@ extern int tcp_connect(struct sock *sk);
855 855
856extern struct sk_buff * tcp_make_synack(struct sock *sk, 856extern struct sk_buff * tcp_make_synack(struct sock *sk,
857 struct dst_entry *dst, 857 struct dst_entry *dst,
858 struct open_request *req); 858 struct request_sock *req);
859 859
860extern int tcp_disconnect(struct sock *sk, int flags); 860extern int tcp_disconnect(struct sock *sk, int flags);
861 861
@@ -1683,7 +1683,7 @@ static inline int tcp_full_space(const struct sock *sk)
1683 return tcp_win_from_space(sk->sk_rcvbuf); 1683 return tcp_win_from_space(sk->sk_rcvbuf);
1684} 1684}
1685 1685
1686static inline void tcp_acceptq_queue(struct sock *sk, struct open_request *req, 1686static inline void tcp_acceptq_queue(struct sock *sk, struct request_sock *req,
1687 struct sock *child) 1687 struct sock *child)
1688{ 1688{
1689 struct tcp_sock *tp = tcp_sk(sk); 1689 struct tcp_sock *tp = tcp_sk(sk);
@@ -1707,11 +1707,11 @@ struct tcp_listen_opt
1707 int qlen_young; 1707 int qlen_young;
1708 int clock_hand; 1708 int clock_hand;
1709 u32 hash_rnd; 1709 u32 hash_rnd;
1710 struct open_request *syn_table[TCP_SYNQ_HSIZE]; 1710 struct request_sock *syn_table[TCP_SYNQ_HSIZE];
1711}; 1711};
1712 1712
1713static inline void 1713static inline void
1714tcp_synq_removed(struct sock *sk, struct open_request *req) 1714tcp_synq_removed(struct sock *sk, struct request_sock *req)
1715{ 1715{
1716 struct tcp_listen_opt *lopt = tcp_sk(sk)->listen_opt; 1716 struct tcp_listen_opt *lopt = tcp_sk(sk)->listen_opt;
1717 1717
@@ -1745,23 +1745,23 @@ static inline int tcp_synq_is_full(struct sock *sk)
1745 return tcp_synq_len(sk) >> tcp_sk(sk)->listen_opt->max_qlen_log; 1745 return tcp_synq_len(sk) >> tcp_sk(sk)->listen_opt->max_qlen_log;
1746} 1746}
1747 1747
1748static inline void tcp_synq_unlink(struct tcp_sock *tp, struct open_request *req, 1748static inline void tcp_synq_unlink(struct tcp_sock *tp, struct request_sock *req,
1749 struct open_request **prev) 1749 struct request_sock **prev)
1750{ 1750{
1751 write_lock(&tp->syn_wait_lock); 1751 write_lock(&tp->syn_wait_lock);
1752 *prev = req->dl_next; 1752 *prev = req->dl_next;
1753 write_unlock(&tp->syn_wait_lock); 1753 write_unlock(&tp->syn_wait_lock);
1754} 1754}
1755 1755
1756static inline void tcp_synq_drop(struct sock *sk, struct open_request *req, 1756static inline void tcp_synq_drop(struct sock *sk, struct request_sock *req,
1757 struct open_request **prev) 1757 struct request_sock **prev)
1758{ 1758{
1759 tcp_synq_unlink(tcp_sk(sk), req, prev); 1759 tcp_synq_unlink(tcp_sk(sk), req, prev);
1760 tcp_synq_removed(sk, req); 1760 tcp_synq_removed(sk, req);
1761 tcp_openreq_free(req); 1761 reqsk_free(req);
1762} 1762}
1763 1763
1764static __inline__ void tcp_openreq_init(struct open_request *req, 1764static __inline__ void tcp_openreq_init(struct request_sock *req,
1765 struct tcp_options_received *rx_opt, 1765 struct tcp_options_received *rx_opt,
1766 struct sk_buff *skb) 1766 struct sk_buff *skb)
1767{ 1767{