rename struct tcp_listen_opt to struct listen_sock

PATCH In review Arnaldo Carvalho de Melo 4 participants 5 messages May 24, 2005 – May 26, 2005

Subsystems (4)

Networking Network drivers TCP Sockets

lore

Share & tools

lore

Arnaldo Carvalho de Melo

author

2005-05-24 01:17 UTC #0 lore raw

PATCH 2/2 rename struct tcp_listen_opt to struct listen_sock

Hi David,

Please consider pulling into your net-2.6.13 pending tree from:

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/acme/net-2.6.13.git

Best Regards,

- Arnaldo

tree b1aabc6ec772af37643e4eab8d35a48f5ca5d799
parent a48a17a6700bb4e6eed677e25422adf478f85c4d
author Arnaldo Carvalho de Melo <[email protected]> 1113624884 -0300 committer Arnaldo Carvalho de Melo <[email protected]> 1116888488 -0300

[NET] rename struct tcp_listen_opt to struct listen_sock

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

------------------------------------------------------------------------------

 include/net/request_sock.h |   16 ++++++++--------
 net/core/request_sock.c    |    4 ++--
 net/ipv4/tcp.c             |    2 +-
 net/ipv4/tcp_diag.c        |    2 +-
 net/ipv4/tcp_ipv4.c        |    4 ++--
 net/ipv4/tcp_timer.c       |    2 +-
 net/ipv6/tcp_ipv6.c        |    4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)

------------------------------------------------------------------------------

include/net/request_sock.h +8 -8

@@ -78,11 +78,11 @@ static inline void reqsk_free(struct req
 
 extern int sysctl_max_syn_backlog;
 
-/** struct tcp_listen_opt - listen state
+/** struct listen_sock - listen state
  *
  * @max_qlen_log - log_2 of maximal queued SYNs/REQUESTs
  */
-struct tcp_listen_opt {
+struct listen_sock {
 	u8			max_qlen_log;
 	/* 3 bytes hole, try to use */
 	int			qlen;

@@ -111,15 +111,15 @@ struct request_sock_queue {
 	struct request_sock	*rskq_accept_head;
 	struct request_sock	*rskq_accept_tail;
 	rwlock_t		syn_wait_lock;
-	struct tcp_listen_opt	*listen_opt;
+	struct listen_sock	*listen_opt;
 };
 
 extern int reqsk_queue_alloc(struct request_sock_queue *queue,
 			     const int nr_table_entries);
 
-static inline struct tcp_listen_opt *reqsk_queue_yank_listen_sk(struct request_sock_queue *queue)
+static inline struct listen_sock *reqsk_queue_yank_listen_sk(struct request_sock_queue *queue)
 {
-	struct tcp_listen_opt *lopt;
+	struct listen_sock *lopt;
 
 	write_lock_bh(&queue->syn_wait_lock);
 	lopt = queue->listen_opt;

@@ -203,7 +203,7 @@ static inline struct sock *reqsk_queue_g
 static inline int reqsk_queue_removed(struct request_sock_queue *queue,
 				      struct request_sock *req)
 {
-	struct tcp_listen_opt *lopt = queue->listen_opt;
+	struct listen_sock *lopt = queue->listen_opt;
 
 	if (req->retrans == 0)
 		--lopt->qlen_young;

@@ -213,7 +213,7 @@ static inline int reqsk_queue_removed(st
 
 static inline int reqsk_queue_added(struct request_sock_queue *queue)
 {
-	struct tcp_listen_opt *lopt = queue->listen_opt;
+	struct listen_sock *lopt = queue->listen_opt;
 	const int prev_qlen = lopt->qlen;
 
 	lopt->qlen_young++;

@@ -240,7 +240,7 @@ static inline void reqsk_queue_hash_req(
 					u32 hash, struct request_sock *req,
 					unsigned timeout)
 {
-	struct tcp_listen_opt *lopt = queue->listen_opt;
+	struct listen_sock *lopt = queue->listen_opt;
 
 	req->expires = jiffies + timeout;
 	req->retrans = 0;

net/core/request_sock.c +2 -2

@@ -21,9 +21,9 @@
 int reqsk_queue_alloc(struct request_sock_queue *queue,
 		      const int nr_table_entries)
 {
-	const int lopt_size = sizeof(struct tcp_listen_opt) +
+	const int lopt_size = sizeof(struct listen_sock) +
 			      nr_table_entries * sizeof(struct request_sock *);
-	struct tcp_listen_opt *lopt = kmalloc(lopt_size, GFP_KERNEL);
+	struct listen_sock *lopt = kmalloc(lopt_size, GFP_KERNEL);
 
 	if (lopt == NULL)
 		return -ENOMEM;

net/ipv4/tcp.c +1 -1

@@ -499,7 +499,7 @@ int tcp_listen_start(struct sock *sk)
 static void tcp_listen_stop (struct sock *sk)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
-	struct tcp_listen_opt *lopt;
+	struct listen_sock *lopt;
 	struct request_sock *acc_req;
 	struct request_sock *req;
 	int i;

net/ipv4/tcp_diag.c +1 -1

@@ -514,7 +514,7 @@ static int tcpdiag_dump_reqs(struct sk_b
 	struct tcpdiag_entry entry;
 	struct tcpdiagreq *r = NLMSG_DATA(cb->nlh);
 	struct tcp_sock *tp = tcp_sk(sk);
-	struct tcp_listen_opt *lopt;
+	struct listen_sock *lopt;
 	struct rtattr *bc = NULL;
 	struct inet_sock *inet = inet_sk(sk);
 	int j, s_j;

net/ipv4/tcp_ipv4.c +2 -2

@@ -874,7 +874,7 @@ static struct request_sock *tcp_v4_searc
 					      __u16 rport,
 					      __u32 raddr, __u32 laddr)
 {
-	struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt;
+	struct listen_sock *lopt = tp->accept_queue.listen_opt;
 	struct request_sock *req, **prev;
 
 	for (prev = &lopt->syn_table[tcp_v4_synq_hash(raddr, rport, lopt->hash_rnd)];

@@ -898,7 +898,7 @@ static struct request_sock *tcp_v4_searc
 static void tcp_v4_synq_add(struct sock *sk, struct request_sock *req)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
-	struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt;
+	struct listen_sock *lopt = tp->accept_queue.listen_opt;
 	u32 h = tcp_v4_synq_hash(inet_rsk(req)->rmt_addr, inet_rsk(req)->rmt_port, lopt->hash_rnd);
 
 	reqsk_queue_hash_req(&tp->accept_queue, h, req, TCP_TIMEOUT_INIT);

net/ipv4/tcp_timer.c +1 -1

@@ -464,7 +464,7 @@ out_unlock:
 static void tcp_synack_timer(struct sock *sk)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
-	struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt;
+	struct listen_sock *lopt = tp->accept_queue.listen_opt;
 	int max_retries = tp->syn_retries ? : sysctl_tcp_synack_retries;
 	int thresh = max_retries;
 	unsigned long now = jiffies;

net/ipv6/tcp_ipv6.c +2 -2

@@ -401,7 +401,7 @@ static struct request_sock *tcp_v6_searc
 					      struct in6_addr *laddr,
 					      int iif)
 {
-	struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt;
+	struct listen_sock *lopt = tp->accept_queue.listen_opt;
 	struct request_sock *req, **prev;  
 
 	for (prev = &lopt->syn_table[tcp_v6_synq_hash(raddr, rport, lopt->hash_rnd)];

@@ -1267,7 +1267,7 @@ static struct sock *tcp_v6_hnd_req(struc
 static void tcp_v6_synq_add(struct sock *sk, struct request_sock *req)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
-	struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt;
+	struct listen_sock *lopt = tp->accept_queue.listen_opt;
 	u32 h = tcp_v6_synq_hash(&tcp6_rsk(req)->rmt_addr, inet_rsk(req)->rmt_port, lopt->hash_rnd);
 
 	reqsk_queue_hash_req(&tp->accept_queue, h, req, TCP_TIMEOUT_INIT);

David S. Miller

maintainer

2005-05-25 23:37 UTC #1 lore raw

From: [email protected] (Arnaldo Carvalho de Melo)
Date: Mon, 23 May 2005 22:17:58 -0300

Quoted 1 line

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/acme/net-2.6.13.git

Both changes look good, pulled. It should show up on kernel.org in a little bit.

Ian McDonald

2005-05-25 23:52 UTC #2 lore raw

David/Arnaldo,

Quoted 9 lines · David S. Miller

From: [email protected] (Arnaldo Carvalho de Melo)
Date: Mon, 23 May 2005 22:17:58 -0300
Quoted 1 line
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/acme/net-2.6.13.git
Both changes look good, pulled. It should show up on kernel.org in a little bit.

Maybe I am looking at the wrong place but when I look at:
http://kernel.org/git/?p=linux/kernel/git/acme/net-2.6.13.git;a=summary

it shows non-network related patches in there as well. Is this intentional?

Ian

Arnaldo Carvalho de Melo

2005-05-26 01:26 UTC #3 lore raw

Quoted 9 lines · Ian McDonald

David/Arnaldo,
Quoted 5 lines · David S. Miller
From: [email protected] (Arnaldo Carvalho de Melo)
Date: Mon, 23 May 2005 22:17:58 -0300
Quoted 1 line
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/acme/net-2.6.13.git

Quoted 8 lines

Quoted 4 lines
Both changes look good, pulled. It should show up on kernel.org in a little bit.
Maybe I am looking at the wrong place but when I look at:
http://kernel.org/git/?p=linux/kernel/git/acme/net-2.6.13.git;a=summary
it shows non-network related patches in there as well. Is this intentional?

Its because I cloned David's tree that cloned Linus tree that... i.e. that summary
is of the last changesets, not necessarily mine or commited by me.

David S. Miller

maintainer

2005-05-26 05:33 UTC #4 lore raw

In reply to Ian McDonald

From: Ian McDonald <[email protected]>
Date: Thu, 26 May 2005 11:52:00 +1200

Quoted 4 lines

Maybe I am looking at the wrong place but when I look at:
http://kernel.org/git/?p=linux/kernel/git/acme/net-2.6.13.git;a=summary
it shows non-network related patches in there as well. Is this intentional?

It shows activity in the tree it is derived from, so yes it's normal.