diff options
author | Patrick McHardy <kaber@trash.net> | 2008-03-20 10:15:49 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-04-14 05:15:48 -0400 |
commit | 2d2d84c40e19a7fce51ba1f124ecde105104192d (patch) | |
tree | 7388dd42d235b02e5028e4bb6242a481f1a47a41 | |
parent | ca6a50749012fc17feeec91ee2f9eeacacf06f0b (diff) |
[NETFILTER]: nf_nat: remove unused name from struct nf_nat_protocol
Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r-- | include/net/netfilter/nf_nat_protocol.h | 3 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_nat_proto_gre.c | 1 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_nat_proto_icmp.c | 1 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_nat_proto_tcp.c | 1 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_nat_proto_udp.c | 1 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_nat_proto_unknown.c | 1 |
6 files changed, 0 insertions, 8 deletions
diff --git a/include/net/netfilter/nf_nat_protocol.h b/include/net/netfilter/nf_nat_protocol.h index 8ce227624eac..fba94a2028d5 100644 --- a/include/net/netfilter/nf_nat_protocol.h +++ b/include/net/netfilter/nf_nat_protocol.h | |||
@@ -8,9 +8,6 @@ struct nf_nat_range; | |||
8 | 8 | ||
9 | struct nf_nat_protocol | 9 | struct nf_nat_protocol |
10 | { | 10 | { |
11 | /* Protocol name */ | ||
12 | const char *name; | ||
13 | |||
14 | /* Protocol number. */ | 11 | /* Protocol number. */ |
15 | unsigned int protonum; | 12 | unsigned int protonum; |
16 | 13 | ||
diff --git a/net/ipv4/netfilter/nf_nat_proto_gre.c b/net/ipv4/netfilter/nf_nat_proto_gre.c index 71b0935ee1c8..84bb7854137a 100644 --- a/net/ipv4/netfilter/nf_nat_proto_gre.c +++ b/net/ipv4/netfilter/nf_nat_proto_gre.c | |||
@@ -118,7 +118,6 @@ gre_manip_pkt(struct sk_buff *skb, unsigned int iphdroff, | |||
118 | } | 118 | } |
119 | 119 | ||
120 | static const struct nf_nat_protocol gre = { | 120 | static const struct nf_nat_protocol gre = { |
121 | .name = "GRE", | ||
122 | .protonum = IPPROTO_GRE, | 121 | .protonum = IPPROTO_GRE, |
123 | .me = THIS_MODULE, | 122 | .me = THIS_MODULE, |
124 | .manip_pkt = gre_manip_pkt, | 123 | .manip_pkt = gre_manip_pkt, |
diff --git a/net/ipv4/netfilter/nf_nat_proto_icmp.c b/net/ipv4/netfilter/nf_nat_proto_icmp.c index ca601f84c4dc..ab3a0ec2a2d1 100644 --- a/net/ipv4/netfilter/nf_nat_proto_icmp.c +++ b/net/ipv4/netfilter/nf_nat_proto_icmp.c | |||
@@ -72,7 +72,6 @@ icmp_manip_pkt(struct sk_buff *skb, | |||
72 | } | 72 | } |
73 | 73 | ||
74 | const struct nf_nat_protocol nf_nat_protocol_icmp = { | 74 | const struct nf_nat_protocol nf_nat_protocol_icmp = { |
75 | .name = "ICMP", | ||
76 | .protonum = IPPROTO_ICMP, | 75 | .protonum = IPPROTO_ICMP, |
77 | .me = THIS_MODULE, | 76 | .me = THIS_MODULE, |
78 | .manip_pkt = icmp_manip_pkt, | 77 | .manip_pkt = icmp_manip_pkt, |
diff --git a/net/ipv4/netfilter/nf_nat_proto_tcp.c b/net/ipv4/netfilter/nf_nat_proto_tcp.c index 1d73a11f55d9..5d4c8a0e89c0 100644 --- a/net/ipv4/netfilter/nf_nat_proto_tcp.c +++ b/net/ipv4/netfilter/nf_nat_proto_tcp.c | |||
@@ -81,7 +81,6 @@ tcp_manip_pkt(struct sk_buff *skb, | |||
81 | } | 81 | } |
82 | 82 | ||
83 | const struct nf_nat_protocol nf_nat_protocol_tcp = { | 83 | const struct nf_nat_protocol nf_nat_protocol_tcp = { |
84 | .name = "TCP", | ||
85 | .protonum = IPPROTO_TCP, | 84 | .protonum = IPPROTO_TCP, |
86 | .me = THIS_MODULE, | 85 | .me = THIS_MODULE, |
87 | .manip_pkt = tcp_manip_pkt, | 86 | .manip_pkt = tcp_manip_pkt, |
diff --git a/net/ipv4/netfilter/nf_nat_proto_udp.c b/net/ipv4/netfilter/nf_nat_proto_udp.c index f36ce552a161..74a7e7b63465 100644 --- a/net/ipv4/netfilter/nf_nat_proto_udp.c +++ b/net/ipv4/netfilter/nf_nat_proto_udp.c | |||
@@ -72,7 +72,6 @@ udp_manip_pkt(struct sk_buff *skb, | |||
72 | } | 72 | } |
73 | 73 | ||
74 | const struct nf_nat_protocol nf_nat_protocol_udp = { | 74 | const struct nf_nat_protocol nf_nat_protocol_udp = { |
75 | .name = "UDP", | ||
76 | .protonum = IPPROTO_UDP, | 75 | .protonum = IPPROTO_UDP, |
77 | .me = THIS_MODULE, | 76 | .me = THIS_MODULE, |
78 | .manip_pkt = udp_manip_pkt, | 77 | .manip_pkt = udp_manip_pkt, |
diff --git a/net/ipv4/netfilter/nf_nat_proto_unknown.c b/net/ipv4/netfilter/nf_nat_proto_unknown.c index a26efeb073cb..cda21ff0e4cf 100644 --- a/net/ipv4/netfilter/nf_nat_proto_unknown.c +++ b/net/ipv4/netfilter/nf_nat_proto_unknown.c | |||
@@ -46,7 +46,6 @@ unknown_manip_pkt(struct sk_buff *skb, | |||
46 | } | 46 | } |
47 | 47 | ||
48 | const struct nf_nat_protocol nf_nat_unknown_protocol = { | 48 | const struct nf_nat_protocol nf_nat_unknown_protocol = { |
49 | .name = "unknown", | ||
50 | /* .me isn't set: getting a ref to this cannot fail. */ | 49 | /* .me isn't set: getting a ref to this cannot fail. */ |
51 | .manip_pkt = unknown_manip_pkt, | 50 | .manip_pkt = unknown_manip_pkt, |
52 | .in_range = unknown_in_range, | 51 | .in_range = unknown_in_range, |