Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b6b84d4a94e95727a4c65841eea23ac60c6aa329

Authored by Yasuyuki Kozakai
Committed by David S. Miller
1 parent d8a0509a69

[NETFILTER]: nf_nat: merge nf_conn and nf_nat_info 

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 3 changed files with 23 additions and 30 deletions Side-by-side Diff

include/net/netfilter/nf_nat.h
Diff comments   View file @ b6b84d4
... ... @@ -54,16 +54,6 @@
54 54 #include <linux/netfilter/nf_conntrack_pptp.h>
55 55 #include <net/netfilter/nf_conntrack_extend.h>
56 56  
57   -struct nf_conn;
58   -
59   -/* The structure embedded in the conntrack structure. */
60   -struct nf_nat_info
61   -{
62   - struct list_head bysource;
63   - struct nf_nat_seq seq[IP_CT_DIR_MAX];
64   - struct nf_conn *ct;
65   -};
66   -
67 57 /* per conntrack: nat application helper private data */
68 58 union nf_conntrack_nat_help
69 59 {
70 60  
... ... @@ -71,9 +61,14 @@
71 61 struct nf_nat_pptp nat_pptp_info;
72 62 };
73 63  
  64 +struct nf_conn;
  65 +
  66 +/* The structure embedded in the conntrack structure. */
74 67 struct nf_conn_nat
75 68 {
76   - struct nf_nat_info info;
  69 + struct list_head bysource;
  70 + struct nf_nat_seq seq[IP_CT_DIR_MAX];
  71 + struct nf_conn *ct;
77 72 union nf_conntrack_nat_help help;
78 73 #if defined(CONFIG_IP_NF_TARGET_MASQUERADE) || \
79 74 defined(CONFIG_IP_NF_TARGET_MASQUERADE_MODULE)
net/ipv4/netfilter/nf_nat_core.c
Diff comments   View file @ b6b84d4
... ... @@ -155,8 +155,8 @@
155 155 struct nf_conn *ct;
156 156  
157 157 read_lock_bh(&nf_nat_lock);
158   - list_for_each_entry(nat, &bysource[h], info.bysource) {
159   - ct = nat->info.ct;
  158 + list_for_each_entry(nat, &bysource[h], bysource) {
  159 + ct = nat->ct;
160 160 if (same_src(ct, tuple)) {
161 161 /* Copy source part from reply tuple. */
162 162 nf_ct_invert_tuplepr(result,
... ... @@ -284,7 +284,6 @@
284 284 {
285 285 struct nf_conntrack_tuple curr_tuple, new_tuple;
286 286 struct nf_conn_nat *nat;
287   - struct nf_nat_info *info;
288 287 int have_to_hash = !(ct->status & IPS_NAT_DONE_MASK);
289 288 enum nf_nat_manip_type maniptype = HOOK2MANIP(hooknum);
290 289  
... ... @@ -335,9 +334,9 @@
335 334 srchash = hash_by_src(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple);
336 335 write_lock_bh(&nf_nat_lock);
337 336 /* nf_conntrack_alter_reply might re-allocate exntension aera */
338   - info = &nfct_nat(ct)->info;
339   - info->ct = ct;
340   - list_add(&info->bysource, &bysource[srchash]);
  337 + nat = nfct_nat(ct);
  338 + nat->ct = ct;
  339 + list_add(&nat->bysource, &bysource[srchash]);
341 340 write_unlock_bh(&nf_nat_lock);
342 341 }
343 342  
344 343  
345 344  
... ... @@ -595,14 +594,14 @@
595 594 {
596 595 struct nf_conn_nat *nat = nf_ct_ext_find(ct, NF_CT_EXT_NAT);
597 596  
598   - if (nat == NULL || nat->info.ct == NULL)
  597 + if (nat == NULL || nat->ct == NULL)
599 598 return;
600 599  
601   - NF_CT_ASSERT(nat->info.ct->status & IPS_NAT_DONE_MASK);
  600 + NF_CT_ASSERT(nat->ct->status & IPS_NAT_DONE_MASK);
602 601  
603 602 write_lock_bh(&nf_nat_lock);
604   - list_del(&nat->info.bysource);
605   - nat->info.ct = NULL;
  603 + list_del(&nat->bysource);
  604 + nat->ct = NULL;
606 605 write_unlock_bh(&nf_nat_lock);
607 606 }
608 607  
... ... @@ -610,7 +609,7 @@
610 609 {
611 610 struct nf_conn_nat *new_nat = nf_ct_ext_find(conntrack, NF_CT_EXT_NAT);
612 611 struct nf_conn_nat *old_nat = (struct nf_conn_nat *)old;
613   - struct nf_conn *ct = old_nat->info.ct;
  612 + struct nf_conn *ct = old_nat->ct;
614 613 unsigned int srchash;
615 614  
616 615 if (!(ct->status & IPS_NAT_DONE_MASK))
... ... @@ -619,8 +618,8 @@
619 618 srchash = hash_by_src(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple);
620 619  
621 620 write_lock_bh(&nf_nat_lock);
622   - list_replace(&old_nat->info.bysource, &new_nat->info.bysource);
623   - new_nat->info.ct = ct;
  621 + list_replace(&old_nat->bysource, &new_nat->bysource);
  622 + new_nat->ct = ct;
624 623 write_unlock_bh(&nf_nat_lock);
625 624 }
626 625  
net/ipv4/netfilter/nf_nat_helper.c
Diff comments   View file @ b6b84d4
... ... @@ -52,8 +52,8 @@
52 52  
53 53 dir = CTINFO2DIR(ctinfo);
54 54  
55   - this_way = &nat->info.seq[dir];
56   - other_way = &nat->info.seq[!dir];
  55 + this_way = &nat->seq[dir];
  56 + other_way = &nat->seq[!dir];
57 57  
58 58 DEBUGP("nf_nat_resize_packet: Seq_offset before: ");
59 59 DUMP_OFFSET(this_way);
... ... @@ -372,8 +372,7 @@
372 372 op[1] >= 2+TCPOLEN_SACK_PERBLOCK &&
373 373 ((op[1] - 2) % TCPOLEN_SACK_PERBLOCK) == 0)
374 374 sack_adjust(*pskb, tcph, optoff+2,
375   - optoff+op[1],
376   - &nat->info.seq[!dir]);
  375 + optoff+op[1], &nat->seq[!dir]);
377 376 optoff += op[1];
378 377 }
379 378 }
... ... @@ -394,8 +393,8 @@
394 393  
395 394 dir = CTINFO2DIR(ctinfo);
396 395  
397   - this_way = &nat->info.seq[dir];
398   - other_way = &nat->info.seq[!dir];
  396 + this_way = &nat->seq[dir];
  397 + other_way = &nat->seq[!dir];
399 398  
400 399 if (!skb_make_writable(pskb, ip_hdrlen(*pskb) + sizeof(*tcph)))
401 400 return 0;