aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-03 21:21:05 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-03 21:21:05 -0500
commit6d9f239a1edb31d6133230f478fd1dc2da338ec5 (patch)
tree305fa0da95a49db4e342f3f3042f8be0968b03ce /net/bridge
parent6cf3f41e6c08bca6641a695449791c38a25f35ff (diff)
net: '&' redux
I want to compile out proc_* and sysctl_* handlers totally and stub them to NULL depending on config options, however usage of & will prevent this, since taking adress of NULL pointer will break compilation. So, drop & in front of every ->proc_handler and every ->strategy handler, it was never needed in fact. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_netfilter.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index fa5cda4e552a..db6176d96e71 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -938,35 +938,35 @@ static ctl_table brnf_table[] = {
938 .data = &brnf_call_arptables, 938 .data = &brnf_call_arptables,
939 .maxlen = sizeof(int), 939 .maxlen = sizeof(int),
940 .mode = 0644, 940 .mode = 0644,
941 .proc_handler = &brnf_sysctl_call_tables, 941 .proc_handler = brnf_sysctl_call_tables,
942 }, 942 },
943 { 943 {
944 .procname = "bridge-nf-call-iptables", 944 .procname = "bridge-nf-call-iptables",
945 .data = &brnf_call_iptables, 945 .data = &brnf_call_iptables,
946 .maxlen = sizeof(int), 946 .maxlen = sizeof(int),
947 .mode = 0644, 947 .mode = 0644,
948 .proc_handler = &brnf_sysctl_call_tables, 948 .proc_handler = brnf_sysctl_call_tables,
949 }, 949 },
950 { 950 {
951 .procname = "bridge-nf-call-ip6tables", 951 .procname = "bridge-nf-call-ip6tables",
952 .data = &brnf_call_ip6tables, 952 .data = &brnf_call_ip6tables,
953 .maxlen = sizeof(int), 953 .maxlen = sizeof(int),
954 .mode = 0644, 954 .mode = 0644,
955 .proc_handler = &brnf_sysctl_call_tables, 955 .proc_handler = brnf_sysctl_call_tables,
956 }, 956 },
957 { 957 {
958 .procname = "bridge-nf-filter-vlan-tagged", 958 .procname = "bridge-nf-filter-vlan-tagged",
959 .data = &brnf_filter_vlan_tagged, 959 .data = &brnf_filter_vlan_tagged,
960 .maxlen = sizeof(int), 960 .maxlen = sizeof(int),
961 .mode = 0644, 961 .mode = 0644,
962 .proc_handler = &brnf_sysctl_call_tables, 962 .proc_handler = brnf_sysctl_call_tables,
963 }, 963 },
964 { 964 {
965 .procname = "bridge-nf-filter-pppoe-tagged", 965 .procname = "bridge-nf-filter-pppoe-tagged",
966 .data = &brnf_filter_pppoe_tagged, 966 .data = &brnf_filter_pppoe_tagged,
967 .maxlen = sizeof(int), 967 .maxlen = sizeof(int),
968 .mode = 0644, 968 .mode = 0644,
969 .proc_handler = &brnf_sysctl_call_tables, 969 .proc_handler = brnf_sysctl_call_tables,
970 }, 970 },
971 { .ctl_name = 0 } 971 { .ctl_name = 0 }
972}; 972};