lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: x_tables: remove unneeded initializations

Browse Source 
Later patches change the locking on xt_table and the initialization of
the lock element is not needed since the lock is always initialized in
xt_table_register anyway.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Stephen Hemminger
2009-02-18 16:30:20 +01:00
committed by Patrick McHardy
parent 4a2f965ca5
commit 9c8222b9e7
10 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/netfilter/arptable_filter.c
View File

@@ -48,8 +48,6 @@ static struct
static struct xt_table packet_filter = { static struct xt_table packet_filter = {
.name = "filter", .name = "filter",
.valid_hooks = FILTER_VALID_HOOKS, .valid_hooks = FILTER_VALID_HOOKS,
.lock = __RW_LOCK_UNLOCKED(packet_filter.lock),
.private = NULL,
.me = THIS_MODULE, .me = THIS_MODULE,
.af = NFPROTO_ARP, .af = NFPROTO_ARP,
}; };

1
net/ipv4/netfilter/iptable_filter.c
View File

@@ -56,7 +56,6 @@ static struct
static struct xt_table packet_filter = { static struct xt_table packet_filter = {
.name = "filter", .name = "filter",
.valid_hooks = FILTER_VALID_HOOKS, .valid_hooks = FILTER_VALID_HOOKS,
.lock = __RW_LOCK_UNLOCKED(packet_filter.lock),
.me = THIS_MODULE, .me = THIS_MODULE,
.af = AF_INET, .af = AF_INET,
}; };

1
net/ipv4/netfilter/iptable_mangle.c
View File

@@ -67,7 +67,6 @@ static struct
static struct xt_table packet_mangler = { static struct xt_table packet_mangler = {
.name = "mangle", .name = "mangle",
.valid_hooks = MANGLE_VALID_HOOKS, .valid_hooks = MANGLE_VALID_HOOKS,
.lock = __RW_LOCK_UNLOCKED(packet_mangler.lock),
.me = THIS_MODULE, .me = THIS_MODULE,
.af = AF_INET, .af = AF_INET,
}; };

1
net/ipv4/netfilter/iptable_raw.c
View File

@@ -39,7 +39,6 @@ static struct
static struct xt_table packet_raw = { static struct xt_table packet_raw = {
.name = "raw", .name = "raw",
.valid_hooks = RAW_VALID_HOOKS, .valid_hooks = RAW_VALID_HOOKS,
.lock = __RW_LOCK_UNLOCKED(packet_raw.lock),
.me = THIS_MODULE, .me = THIS_MODULE,
.af = AF_INET, .af = AF_INET,
}; };

1
net/ipv4/netfilter/iptable_security.c
View File

@@ -60,7 +60,6 @@ static struct
static struct xt_table security_table = { static struct xt_table security_table = {
.name = "security", .name = "security",
.valid_hooks = SECURITY_VALID_HOOKS, .valid_hooks = SECURITY_VALID_HOOKS,
.lock = __RW_LOCK_UNLOCKED(security_table.lock),
.me = THIS_MODULE, .me = THIS_MODULE,
.af = AF_INET, .af = AF_INET,
}; };

1
net/ipv4/netfilter/nf_nat_rule.c
View File

@@ -61,7 +61,6 @@ static struct
static struct xt_table nat_table = { static struct xt_table nat_table = {
.name = "nat", .name = "nat",
.valid_hooks = NAT_VALID_HOOKS, .valid_hooks = NAT_VALID_HOOKS,
.lock = __RW_LOCK_UNLOCKED(nat_table.lock),
.me = THIS_MODULE, .me = THIS_MODULE,
.af = AF_INET, .af = AF_INET,
}; };

1
net/ipv6/netfilter/ip6table_filter.c
View File

@@ -54,7 +54,6 @@ static struct
static struct xt_table packet_filter = { static struct xt_table packet_filter = {
.name = "filter", .name = "filter",
.valid_hooks = FILTER_VALID_HOOKS, .valid_hooks = FILTER_VALID_HOOKS,
.lock = __RW_LOCK_UNLOCKED(packet_filter.lock),
.me = THIS_MODULE, .me = THIS_MODULE,
.af = AF_INET6, .af = AF_INET6,
}; };

1
net/ipv6/netfilter/ip6table_mangle.c
View File

@@ -60,7 +60,6 @@ static struct
static struct xt_table packet_mangler = { static struct xt_table packet_mangler = {
.name = "mangle", .name = "mangle",
.valid_hooks = MANGLE_VALID_HOOKS, .valid_hooks = MANGLE_VALID_HOOKS,
.lock = __RW_LOCK_UNLOCKED(packet_mangler.lock),
.me = THIS_MODULE, .me = THIS_MODULE,
.af = AF_INET6, .af = AF_INET6,
}; };

1
net/ipv6/netfilter/ip6table_raw.c
View File

@@ -38,7 +38,6 @@ static struct
static struct xt_table packet_raw = { static struct xt_table packet_raw = {
.name = "raw", .name = "raw",
.valid_hooks = RAW_VALID_HOOKS, .valid_hooks = RAW_VALID_HOOKS,
.lock = __RW_LOCK_UNLOCKED(packet_raw.lock),
.me = THIS_MODULE, .me = THIS_MODULE,
.af = AF_INET6, .af = AF_INET6,
}; };

1
net/ipv6/netfilter/ip6table_security.c
View File

@@ -59,7 +59,6 @@ static struct
static struct xt_table security_table = { static struct xt_table security_table = {
.name = "security", .name = "security",
.valid_hooks = SECURITY_VALID_HOOKS, .valid_hooks = SECURITY_VALID_HOOKS,
.lock = __RW_LOCK_UNLOCKED(security_table.lock),
.me = THIS_MODULE, .me = THIS_MODULE,
.af = AF_INET6, .af = AF_INET6,
}; };