Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 2ad69c55a282315e6119cf7fd744f26a925bdfd2

Authored by Arnaldo Carvalho de Melo
Committed by David S. Miller
1 parent 0e87506fcc
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[NET] rename struct tcp_listen_opt to struct listen_sock 

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 7 changed files with 17 additions and 17 deletions Side-by-side Diff

include/net/request_sock.h
Diff comments   View file @ 2ad69c5
... ... @@ -78,11 +78,11 @@
78 78  
79 79 extern int sysctl_max_syn_backlog;
80 80  
81   -/** struct tcp_listen_opt - listen state
  81 +/** struct listen_sock - listen state
82 82 *
83 83 * @max_qlen_log - log_2 of maximal queued SYNs/REQUESTs
84 84 */
85   -struct tcp_listen_opt {
  85 +struct listen_sock {
86 86 u8 max_qlen_log;
87 87 /* 3 bytes hole, try to use */
88 88 int qlen;
89 89  
90 90  
... ... @@ -111,15 +111,15 @@
111 111 struct request_sock *rskq_accept_head;
112 112 struct request_sock *rskq_accept_tail;
113 113 rwlock_t syn_wait_lock;
114   - struct tcp_listen_opt *listen_opt;
  114 + struct listen_sock *listen_opt;
115 115 };
116 116  
117 117 extern int reqsk_queue_alloc(struct request_sock_queue *queue,
118 118 const int nr_table_entries);
119 119  
120   -static inline struct tcp_listen_opt *reqsk_queue_yank_listen_sk(struct request_sock_queue *queue)
  120 +static inline struct listen_sock *reqsk_queue_yank_listen_sk(struct request_sock_queue *queue)
121 121 {
122   - struct tcp_listen_opt *lopt;
  122 + struct listen_sock *lopt;
123 123  
124 124 write_lock_bh(&queue->syn_wait_lock);
125 125 lopt = queue->listen_opt;
... ... @@ -203,7 +203,7 @@
203 203 static inline int reqsk_queue_removed(struct request_sock_queue *queue,
204 204 struct request_sock *req)
205 205 {
206   - struct tcp_listen_opt *lopt = queue->listen_opt;
  206 + struct listen_sock *lopt = queue->listen_opt;
207 207  
208 208 if (req->retrans == 0)
209 209 --lopt->qlen_young;
... ... @@ -213,7 +213,7 @@
213 213  
214 214 static inline int reqsk_queue_added(struct request_sock_queue *queue)
215 215 {
216   - struct tcp_listen_opt *lopt = queue->listen_opt;
  216 + struct listen_sock *lopt = queue->listen_opt;
217 217 const int prev_qlen = lopt->qlen;
218 218  
219 219 lopt->qlen_young++;
... ... @@ -240,7 +240,7 @@
240 240 u32 hash, struct request_sock *req,
241 241 unsigned timeout)
242 242 {
243   - struct tcp_listen_opt *lopt = queue->listen_opt;
  243 + struct listen_sock *lopt = queue->listen_opt;
244 244  
245 245 req->expires = jiffies + timeout;
246 246 req->retrans = 0;
net/core/request_sock.c
Diff comments   View file @ 2ad69c5
... ... @@ -21,9 +21,9 @@
21 21 int reqsk_queue_alloc(struct request_sock_queue *queue,
22 22 const int nr_table_entries)
23 23 {
24   - const int lopt_size = sizeof(struct tcp_listen_opt) +
  24 + const int lopt_size = sizeof(struct listen_sock) +
25 25 nr_table_entries * sizeof(struct request_sock *);
26   - struct tcp_listen_opt *lopt = kmalloc(lopt_size, GFP_KERNEL);
  26 + struct listen_sock *lopt = kmalloc(lopt_size, GFP_KERNEL);
27 27  
28 28 if (lopt == NULL)
29 29 return -ENOMEM;
... ... @@ -499,7 +499,7 @@
499 499 static void tcp_listen_stop (struct sock *sk)
500 500 {
501 501 struct tcp_sock *tp = tcp_sk(sk);
502   - struct tcp_listen_opt *lopt;
  502 + struct listen_sock *lopt;
503 503 struct request_sock *acc_req;
504 504 struct request_sock *req;
505 505 int i;
... ... @@ -514,7 +514,7 @@
514 514 struct tcpdiag_entry entry;
515 515 struct tcpdiagreq *r = NLMSG_DATA(cb->nlh);
516 516 struct tcp_sock *tp = tcp_sk(sk);
517   - struct tcp_listen_opt *lopt;
  517 + struct listen_sock *lopt;
518 518 struct rtattr *bc = NULL;
519 519 struct inet_sock *inet = inet_sk(sk);
520 520 int j, s_j;
... ... @@ -874,7 +874,7 @@
874 874 __u16 rport,
875 875 __u32 raddr, __u32 laddr)
876 876 {
877   - struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt;
  877 + struct listen_sock *lopt = tp->accept_queue.listen_opt;
878 878 struct request_sock *req, **prev;
879 879  
880 880 for (prev = &lopt->syn_table[tcp_v4_synq_hash(raddr, rport, lopt->hash_rnd)];
... ... @@ -898,7 +898,7 @@
898 898 static void tcp_v4_synq_add(struct sock *sk, struct request_sock *req)
899 899 {
900 900 struct tcp_sock *tp = tcp_sk(sk);
901   - struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt;
  901 + struct listen_sock *lopt = tp->accept_queue.listen_opt;
902 902 u32 h = tcp_v4_synq_hash(inet_rsk(req)->rmt_addr, inet_rsk(req)->rmt_port, lopt->hash_rnd);
903 903  
904 904 reqsk_queue_hash_req(&tp->accept_queue, h, req, TCP_TIMEOUT_INIT);
net/ipv4/tcp_timer.c
Diff comments   View file @ 2ad69c5
... ... @@ -464,7 +464,7 @@
464 464 static void tcp_synack_timer(struct sock *sk)
465 465 {
466 466 struct tcp_sock *tp = tcp_sk(sk);
467   - struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt;
  467 + struct listen_sock *lopt = tp->accept_queue.listen_opt;
468 468 int max_retries = tp->syn_retries ? : sysctl_tcp_synack_retries;
469 469 int thresh = max_retries;
470 470 unsigned long now = jiffies;
... ... @@ -401,7 +401,7 @@
401 401 struct in6_addr *laddr,
402 402 int iif)
403 403 {
404   - struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt;
  404 + struct listen_sock *lopt = tp->accept_queue.listen_opt;
405 405 struct request_sock *req, **prev;
406 406  
407 407 for (prev = &lopt->syn_table[tcp_v6_synq_hash(raddr, rport, lopt->hash_rnd)];
... ... @@ -1267,7 +1267,7 @@
1267 1267 static void tcp_v6_synq_add(struct sock *sk, struct request_sock *req)
1268 1268 {
1269 1269 struct tcp_sock *tp = tcp_sk(sk);
1270   - struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt;
  1270 + struct listen_sock *lopt = tp->accept_queue.listen_opt;
1271 1271 u32 h = tcp_v6_synq_hash(&tcp6_rsk(req)->rmt_addr, inet_rsk(req)->rmt_port, lopt->hash_rnd);
1272 1272  
1273 1273 reqsk_queue_hash_req(&tp->accept_queue, h, req, TCP_TIMEOUT_INIT);