Eric Lee / smarc-ti-linux-kernel

5
Download as
Browse Code ยป

Commit dcd93ed4cd1669b2c1510e801fe5f1132390761c

Authored by stephen hemminger
Committed by Pablo Neira Ayuso
1 parent 02eca9d2cc
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, 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.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

netfilter: nf_conntrack: remove dead code 

The following code is not used in current upstream code.
Some of this seems to be old hooks, other might be used by some
out of tree module (which I don't care about breaking), and
the need_ipv4_conntrack was used by old NAT code but no longer
called.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Showing 5 changed files with 0 additions and 30 deletions Side-by-side Diff

include/net/netfilter/ipv4/nf_conntrack_ipv4.h
Diff comments   View file @ dcd93ed
... ... @@ -19,7 +19,5 @@
19 19 int nf_conntrack_ipv4_compat_init(void);
20 20 void nf_conntrack_ipv4_compat_fini(void);
21 21  
22   -void need_ipv4_conntrack(void);
23   -
24 22 #endif /*_NF_CONNTRACK_IPV4_H*/
include/net/netfilter/nf_conntrack_l3proto.h
Diff comments   View file @ dcd93ed
... ... @@ -87,7 +87,6 @@
87 87 void nf_ct_l3proto_unregister(struct nf_conntrack_l3proto *proto);
88 88  
89 89 struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto);
90   -void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p);
91 90  
92 91 /* Existing built-in protocols */
93 92 extern struct nf_conntrack_l3proto nf_conntrack_l3proto_generic;
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
Diff comments   View file @ dcd93ed
... ... @@ -548,10 +548,4 @@
548 548  
549 549 module_init(nf_conntrack_l3proto_ipv4_init);
550 550 module_exit(nf_conntrack_l3proto_ipv4_fini);
551   -
552   -void need_ipv4_conntrack(void)
553   -{
554   - return;
555   -}
556   -EXPORT_SYMBOL_GPL(need_ipv4_conntrack);
net/netfilter/nf_conntrack_core.c
Diff comments   View file @ dcd93ed
... ... @@ -60,12 +60,6 @@
60 60 const struct nlattr *attr) __read_mostly;
61 61 EXPORT_SYMBOL_GPL(nfnetlink_parse_nat_setup_hook);
62 62  
63   -int (*nf_nat_seq_adjust_hook)(struct sk_buff *skb,
64   - struct nf_conn *ct,
65   - enum ip_conntrack_info ctinfo,
66   - unsigned int protoff);
67   -EXPORT_SYMBOL_GPL(nf_nat_seq_adjust_hook);
68   -
69 63 DEFINE_SPINLOCK(nf_conntrack_lock);
70 64 EXPORT_SYMBOL_GPL(nf_conntrack_lock);
71 65  
... ... @@ -360,15 +354,6 @@
360 354  
361 355 return NULL;
362 356 }
363   -
364   -struct nf_conntrack_tuple_hash *
365   -__nf_conntrack_find(struct net *net, u16 zone,
366   - const struct nf_conntrack_tuple *tuple)
367   -{
368   - return ____nf_conntrack_find(net, zone, tuple,
369   - hash_conntrack_raw(tuple, zone));
370   -}
371   -EXPORT_SYMBOL_GPL(__nf_conntrack_find);
372 357  
373 358 /* Find a connection corresponding to a tuple. */
374 359 static struct nf_conntrack_tuple_hash *
net/netfilter/nf_conntrack_proto.c
Diff comments   View file @ dcd93ed
... ... @@ -92,12 +92,6 @@
92 92 }
93 93 EXPORT_SYMBOL_GPL(nf_ct_l3proto_find_get);
94 94  
95   -void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p)
96   -{
97   - module_put(p->me);
98   -}
99   -EXPORT_SYMBOL_GPL(nf_ct_l3proto_put);
100   -
101 95 int
102 96 nf_ct_l3proto_try_module_get(unsigned short l3proto)
103 97 {