Commit c56cc9c0 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: nf_conntrack: remove print_conntrack function from l3protos



Its unused and unlikely to ever be used.
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b334aadc
...@@ -42,9 +42,6 @@ struct nf_conntrack_l3proto ...@@ -42,9 +42,6 @@ struct nf_conntrack_l3proto
int (*print_tuple)(struct seq_file *s, int (*print_tuple)(struct seq_file *s,
const struct nf_conntrack_tuple *); const struct nf_conntrack_tuple *);
/* Print out the private part of the conntrack. */
int (*print_conntrack)(struct seq_file *s, const struct nf_conn *);
/* Returns verdict for packet, or -1 for invalid. */ /* Returns verdict for packet, or -1 for invalid. */
int (*packet)(struct nf_conn *conntrack, int (*packet)(struct nf_conn *conntrack,
const struct sk_buff *skb, const struct sk_buff *skb,
......
...@@ -56,12 +56,6 @@ static int ipv4_print_tuple(struct seq_file *s, ...@@ -56,12 +56,6 @@ static int ipv4_print_tuple(struct seq_file *s,
NIPQUAD(tuple->dst.u3.ip)); NIPQUAD(tuple->dst.u3.ip));
} }
static int ipv4_print_conntrack(struct seq_file *s,
const struct nf_conn *conntrack)
{
return 0;
}
/* Returns new sk_buff, or NULL */ /* Returns new sk_buff, or NULL */
static int nf_ct_ipv4_gather_frags(struct sk_buff *skb, u_int32_t user) static int nf_ct_ipv4_gather_frags(struct sk_buff *skb, u_int32_t user)
{ {
...@@ -403,7 +397,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = { ...@@ -403,7 +397,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {
.pkt_to_tuple = ipv4_pkt_to_tuple, .pkt_to_tuple = ipv4_pkt_to_tuple,
.invert_tuple = ipv4_invert_tuple, .invert_tuple = ipv4_invert_tuple,
.print_tuple = ipv4_print_tuple, .print_tuple = ipv4_print_tuple,
.print_conntrack = ipv4_print_conntrack,
.get_l4proto = ipv4_get_l4proto, .get_l4proto = ipv4_get_l4proto,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.tuple_to_nlattr = ipv4_tuple_to_nlattr, .tuple_to_nlattr = ipv4_tuple_to_nlattr,
......
...@@ -121,9 +121,6 @@ static int ct_seq_show(struct seq_file *s, void *v) ...@@ -121,9 +121,6 @@ static int ct_seq_show(struct seq_file *s, void *v)
? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0) ? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0)
return -ENOSPC; return -ENOSPC;
if (l3proto->print_conntrack(s, ct))
return -ENOSPC;
if (l4proto->print_conntrack(s, ct)) if (l4proto->print_conntrack(s, ct))
return -ENOSPC; return -ENOSPC;
......
...@@ -60,12 +60,6 @@ static int ipv6_print_tuple(struct seq_file *s, ...@@ -60,12 +60,6 @@ static int ipv6_print_tuple(struct seq_file *s,
NIP6(*((struct in6_addr *)tuple->dst.u3.ip6))); NIP6(*((struct in6_addr *)tuple->dst.u3.ip6)));
} }
static int ipv6_print_conntrack(struct seq_file *s,
const struct nf_conn *conntrack)
{
return 0;
}
/* /*
* Based on ipv6_skip_exthdr() in net/ipv6/exthdr.c * Based on ipv6_skip_exthdr() in net/ipv6/exthdr.c
* *
...@@ -376,7 +370,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 __read_mostly = { ...@@ -376,7 +370,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 __read_mostly = {
.pkt_to_tuple = ipv6_pkt_to_tuple, .pkt_to_tuple = ipv6_pkt_to_tuple,
.invert_tuple = ipv6_invert_tuple, .invert_tuple = ipv6_invert_tuple,
.print_tuple = ipv6_print_tuple, .print_tuple = ipv6_print_tuple,
.print_conntrack = ipv6_print_conntrack,
.get_l4proto = ipv6_get_l4proto, .get_l4proto = ipv6_get_l4proto,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.tuple_to_nlattr = ipv6_tuple_to_nlattr, .tuple_to_nlattr = ipv6_tuple_to_nlattr,
......
...@@ -55,12 +55,6 @@ static int generic_print_tuple(struct seq_file *s, ...@@ -55,12 +55,6 @@ static int generic_print_tuple(struct seq_file *s,
return 0; return 0;
} }
static int generic_print_conntrack(struct seq_file *s,
const struct nf_conn *conntrack)
{
return 0;
}
static int generic_get_l4proto(const struct sk_buff *skb, unsigned int nhoff, static int generic_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
unsigned int *dataoff, u_int8_t *protonum) unsigned int *dataoff, u_int8_t *protonum)
{ {
...@@ -75,7 +69,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_generic __read_mostly = { ...@@ -75,7 +69,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_generic __read_mostly = {
.pkt_to_tuple = generic_pkt_to_tuple, .pkt_to_tuple = generic_pkt_to_tuple,
.invert_tuple = generic_invert_tuple, .invert_tuple = generic_invert_tuple,
.print_tuple = generic_print_tuple, .print_tuple = generic_print_tuple,
.print_conntrack = generic_print_conntrack,
.get_l4proto = generic_get_l4proto, .get_l4proto = generic_get_l4proto,
}; };
EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_generic); EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_generic);
...@@ -142,9 +142,6 @@ static int ct_seq_show(struct seq_file *s, void *v) ...@@ -142,9 +142,6 @@ static int ct_seq_show(struct seq_file *s, void *v)
? (long)(conntrack->timeout.expires - jiffies)/HZ : 0) != 0) ? (long)(conntrack->timeout.expires - jiffies)/HZ : 0) != 0)
return -ENOSPC; return -ENOSPC;
if (l3proto->print_conntrack(s, conntrack))
return -ENOSPC;
if (l4proto->print_conntrack(s, conntrack)) if (l4proto->print_conntrack(s, conntrack))
return -ENOSPC; return -ENOSPC;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment