diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_chash.h | 4 | ||||
-rw-r--r-- | kernel/include/linux/netfilter/ipset/jhash.h (renamed from kernel/include/linux/netfilter/ipset/ip_set_jhash.h) | 0 | ||||
-rw-r--r-- | kernel/include/linux/netfilter/ipset/slist.h (renamed from kernel/include/linux/netfilter/ipset/ip_set_slist.h) | 0 | ||||
-rw-r--r-- | kernel/ip_set_hash_ip.c | 2 | ||||
-rw-r--r-- | kernel/ip_set_hash_ipport.c | 2 | ||||
-rw-r--r-- | kernel/ip_set_hash_ipportip.c | 2 | ||||
-rw-r--r-- | kernel/ip_set_hash_ipportnet.c | 2 | ||||
-rw-r--r-- | kernel/ip_set_hash_net.c | 2 | ||||
-rw-r--r-- | kernel/ip_set_hash_netport.c | 2 |
9 files changed, 8 insertions, 8 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_chash.h b/kernel/include/linux/netfilter/ipset/ip_set_chash.h index cd5e2f5..04955ef 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_chash.h +++ b/kernel/include/linux/netfilter/ipset/ip_set_chash.h @@ -1,8 +1,8 @@ #ifndef _IP_SET_CHASH_H #define _IP_SET_CHASH_H -#include <linux/netfilter/ipset/ip_set_jhash.h> -#include <linux/netfilter/ipset/ip_set_slist.h> +#include <linux/netfilter/ipset/jhash.h> +#include <linux/netfilter/ipset/slist.h> #include <linux/netfilter/ipset/ip_set_timeout.h> /* Cacheline friendly hash with resizing when linear searching becomes too diff --git a/kernel/include/linux/netfilter/ipset/ip_set_jhash.h b/kernel/include/linux/netfilter/ipset/jhash.h index 72ca901..72ca901 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_jhash.h +++ b/kernel/include/linux/netfilter/ipset/jhash.h diff --git a/kernel/include/linux/netfilter/ipset/ip_set_slist.h b/kernel/include/linux/netfilter/ipset/slist.h index e472e43..e472e43 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_slist.h +++ b/kernel/include/linux/netfilter/ipset/slist.h diff --git a/kernel/ip_set_hash_ip.c b/kernel/ip_set_hash_ip.c index d5ba155..372a8b8 100644 --- a/kernel/ip_set_hash_ip.c +++ b/kernel/ip_set_hash_ip.c @@ -8,7 +8,7 @@ /* Kernel module implementing an IP set type: the hash:ip type */ #include <linux/netfilter/ipset/ip_set_kernel.h> -#include <linux/netfilter/ipset/ip_set_jhash.h> +#include <linux/netfilter/ipset/jhash.h> #include <linux/module.h> #include <linux/ip.h> #include <linux/skbuff.h> diff --git a/kernel/ip_set_hash_ipport.c b/kernel/ip_set_hash_ipport.c index 92851c7..22397fb 100644 --- a/kernel/ip_set_hash_ipport.c +++ b/kernel/ip_set_hash_ipport.c @@ -8,7 +8,7 @@ /* Kernel module implementing an IP set type: the hash:ip,port type */ #include <linux/netfilter/ipset/ip_set_kernel.h> -#include <linux/netfilter/ipset/ip_set_jhash.h> +#include <linux/netfilter/ipset/jhash.h> #include <linux/module.h> #include <linux/ip.h> #include <linux/skbuff.h> diff --git a/kernel/ip_set_hash_ipportip.c b/kernel/ip_set_hash_ipportip.c index af91dc1..bad0337 100644 --- a/kernel/ip_set_hash_ipportip.c +++ b/kernel/ip_set_hash_ipportip.c @@ -8,7 +8,7 @@ /* Kernel module implementing an IP set type: the hash:ip,port,ip type */ #include <linux/netfilter/ipset/ip_set_kernel.h> -#include <linux/netfilter/ipset/ip_set_jhash.h> +#include <linux/netfilter/ipset/jhash.h> #include <linux/module.h> #include <linux/ip.h> #include <linux/skbuff.h> diff --git a/kernel/ip_set_hash_ipportnet.c b/kernel/ip_set_hash_ipportnet.c index f9c3192..c078dc4 100644 --- a/kernel/ip_set_hash_ipportnet.c +++ b/kernel/ip_set_hash_ipportnet.c @@ -8,7 +8,7 @@ /* Kernel module implementing an IP set type: the hash:ip,port,net type */ #include <linux/netfilter/ipset/ip_set_kernel.h> -#include <linux/netfilter/ipset/ip_set_jhash.h> +#include <linux/netfilter/ipset/jhash.h> #include <linux/module.h> #include <linux/ip.h> #include <linux/skbuff.h> diff --git a/kernel/ip_set_hash_net.c b/kernel/ip_set_hash_net.c index 988a7bb..d252760 100644 --- a/kernel/ip_set_hash_net.c +++ b/kernel/ip_set_hash_net.c @@ -8,7 +8,7 @@ /* Kernel module implementing an IP set type: the hash:net type */ #include <linux/netfilter/ipset/ip_set_kernel.h> -#include <linux/netfilter/ipset/ip_set_jhash.h> +#include <linux/netfilter/ipset/jhash.h> #include <linux/module.h> #include <linux/ip.h> #include <linux/skbuff.h> diff --git a/kernel/ip_set_hash_netport.c b/kernel/ip_set_hash_netport.c index da81d6e..d95b3c7 100644 --- a/kernel/ip_set_hash_netport.c +++ b/kernel/ip_set_hash_netport.c @@ -8,7 +8,7 @@ /* Kernel module implementing an IP set type: the hash:net,port type */ #include <linux/netfilter/ipset/ip_set_kernel.h> -#include <linux/netfilter/ipset/ip_set_jhash.h> +#include <linux/netfilter/ipset/jhash.h> #include <linux/module.h> #include <linux/ip.h> #include <linux/skbuff.h> |