diff options
author | Patrick McHardy <kaber@trash.net> | 2008-01-15 02:49:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:02:41 -0500 |
commit | c56cc9c07b049acc9d2ca97be0b540978c0c80bf (patch) | |
tree | 08ec1d0d7083b8f87db50e746c6ac0c8ac3ad49b /net/ipv4 | |
parent | b334aadc3c5cd4dae2a44f3dac09b3ef718ccde1 (diff) |
[NETFILTER]: nf_conntrack: remove print_conntrack function from l3protos
Its unused and unlikely to ever be used.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 7 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c index 78e64951137a..ac3d61d8026e 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | |||
@@ -56,12 +56,6 @@ static int ipv4_print_tuple(struct seq_file *s, | |||
56 | NIPQUAD(tuple->dst.u3.ip)); | 56 | NIPQUAD(tuple->dst.u3.ip)); |
57 | } | 57 | } |
58 | 58 | ||
59 | static int ipv4_print_conntrack(struct seq_file *s, | ||
60 | const struct nf_conn *conntrack) | ||
61 | { | ||
62 | return 0; | ||
63 | } | ||
64 | |||
65 | /* Returns new sk_buff, or NULL */ | 59 | /* Returns new sk_buff, or NULL */ |
66 | static int nf_ct_ipv4_gather_frags(struct sk_buff *skb, u_int32_t user) | 60 | static int nf_ct_ipv4_gather_frags(struct sk_buff *skb, u_int32_t user) |
67 | { | 61 | { |
@@ -403,7 +397,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = { | |||
403 | .pkt_to_tuple = ipv4_pkt_to_tuple, | 397 | .pkt_to_tuple = ipv4_pkt_to_tuple, |
404 | .invert_tuple = ipv4_invert_tuple, | 398 | .invert_tuple = ipv4_invert_tuple, |
405 | .print_tuple = ipv4_print_tuple, | 399 | .print_tuple = ipv4_print_tuple, |
406 | .print_conntrack = ipv4_print_conntrack, | ||
407 | .get_l4proto = ipv4_get_l4proto, | 400 | .get_l4proto = ipv4_get_l4proto, |
408 | #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) | 401 | #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) |
409 | .tuple_to_nlattr = ipv4_tuple_to_nlattr, | 402 | .tuple_to_nlattr = ipv4_tuple_to_nlattr, |
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c index 741f3dfaa5a1..acde9952cadf 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | |||
@@ -121,9 +121,6 @@ static int ct_seq_show(struct seq_file *s, void *v) | |||
121 | ? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0) | 121 | ? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0) |
122 | return -ENOSPC; | 122 | return -ENOSPC; |
123 | 123 | ||
124 | if (l3proto->print_conntrack(s, ct)) | ||
125 | return -ENOSPC; | ||
126 | |||
127 | if (l4proto->print_conntrack(s, ct)) | 124 | if (l4proto->print_conntrack(s, ct)) |
128 | return -ENOSPC; | 125 | return -ENOSPC; |
129 | 126 | ||