[NETFILTER]: Introduce NF_INET_ hook values

The IPv4 and IPv6 hook values are identical, yet some code tries to figure
out the "correct" value by looking at the address family. Introduce NF_INET_*
values for both IPv4 and IPv6. The old values are kept in a #ifndef __KERNEL__
section for userspace compatibility.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/compat.c b/net/compat.c
index 377e560ab5c9..f4ef4c048652 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -325,8 +325,8 @@ struct compat_ipt_replace {
         u32                     valid_hooks;
         u32                     num_entries;
         u32                     size;
-        u32                     hook_entry[NF_IP_NUMHOOKS];
-        u32                     underflow[NF_IP_NUMHOOKS];
+        u32                     hook_entry[NF_INET_NUMHOOKS];
+        u32                     underflow[NF_INET_NUMHOOKS];
         u32                     num_counters;
         compat_uptr_t           counters;       /* struct ipt_counters * */
         struct ipt_entry        entries[0];
@@ -391,7 +391,7 @@ static int do_netfilter_replace(int fd, int level, int optname,
                            origsize))
                 goto out;
 
-        for (i = 0; i < NF_IP_NUMHOOKS; i++) {
+        for (i = 0; i < NF_INET_NUMHOOKS; i++) {
                 if (__get_user(tmp32, &urepl->hook_entry[i]) ||
                     __put_user(tmp32, &repl_nat->hook_entry[i]) ||
                     __get_user(tmp32, &urepl->underflow[i]) ||