2 files changed, 13 insertions, 8 deletions

diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index f7efb3f27bf5..ff0c594a4198 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -1146,12 +1146,14 @@ void arpt_unregister_table(struct arpt_table *table)
 static struct arpt_target arpt_standard_target = {
         .name           = ARPT_STANDARD_TARGET,
         .targetsize     = sizeof(int),
+        .family         = NF_ARP,
 };
 
 static struct arpt_target arpt_error_target = {
         .name           = ARPT_ERROR_TARGET,
         .target         = arpt_error,
         .targetsize     = ARPT_FUNCTION_MAXNAMELEN,
+        .family         = NF_ARP,
 };
 
 static struct nf_sockopt_ops arpt_sockopts = {
@@ -1171,8 +1173,8 @@ static int __init init(void)
         xt_proto_init(NF_ARP);
 
         /* Noone else will be downing sem now, so we won't sleep */
-        xt_register_target(NF_ARP, &arpt_standard_target);
-        xt_register_target(NF_ARP, &arpt_error_target);
+        xt_register_target(&arpt_standard_target);
+        xt_register_target(&arpt_error_target);
 
         /* Register setsockopt */
         ret = nf_register_sockopt(&arpt_sockopts);
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 39705f9bc154..a7b194c4d79d 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -1335,12 +1335,14 @@ icmp_checkentry(const char *tablename,
 static struct ipt_target ipt_standard_target = {
         .name           = IPT_STANDARD_TARGET,
         .targetsize     = sizeof(int),
+        .family         = AF_INET,
 };
 
 static struct ipt_target ipt_error_target = {
         .name           = IPT_ERROR_TARGET,
         .target         = ipt_error,
         .targetsize     = IPT_FUNCTION_MAXNAMELEN,
+        .family         = AF_INET,
 };
 
 static struct nf_sockopt_ops ipt_sockopts = {
@@ -1358,6 +1360,7 @@ static struct ipt_match icmp_matchstruct = {
         .match          = icmp_match,
         .matchsize      = sizeof(struct ipt_icmp),
         .proto          = IPPROTO_ICMP,
+        .family         = AF_INET,
         .checkentry     = icmp_checkentry,
 };
 
@@ -1368,9 +1371,9 @@ static int __init init(void)
         xt_proto_init(AF_INET);
 
         /* Noone else will be downing sem now, so we won't sleep */
-        xt_register_target(AF_INET, &ipt_standard_target);
-        xt_register_target(AF_INET, &ipt_error_target);
-        xt_register_match(AF_INET, &icmp_matchstruct);
+        xt_register_target(&ipt_standard_target);
+        xt_register_target(&ipt_error_target);
+        xt_register_match(&icmp_matchstruct);
 
         /* Register setsockopt */
         ret = nf_register_sockopt(&ipt_sockopts);
@@ -1387,9 +1390,9 @@ static void __exit fini(void)
 {
         nf_unregister_sockopt(&ipt_sockopts);
 
-        xt_unregister_match(AF_INET, &icmp_matchstruct);
-        xt_unregister_target(AF_INET, &ipt_error_target);
-        xt_unregister_target(AF_INET, &ipt_standard_target);
+        xt_unregister_match(&icmp_matchstruct);
+        xt_unregister_target(&ipt_error_target);
+        xt_unregister_target(&ipt_standard_target);
 
         xt_proto_fini(AF_INET);
 }