From: Patrick McHardy <kaber@trash.net> Date: Tue, 1 Feb 2011 15:57:37 +0000 (+0100) Subject: netfilter: ipset: remove unnecessary includes X-Git-Tag: MMI-PSA29.97-13-9~20520^2~10^2~64 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=582e1fc85ca3727abd4e99109a267c514ea5c260;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git netfilter: ipset: remove unnecessary includes None of the set types need uaccess.h since this is handled centrally in ip_set_core. Most set types additionally don't need bitops.h and spinlock.h since they use neither. tcp.h is only needed by those using before(), udp.h is not needed at all. Signed-off-by: Patrick McHardy <kaber@trash.net> --- diff --git a/net/netfilter/ipset/ip_set_bitmap_ip.c b/net/netfilter/ipset/ip_set_bitmap_ip.c index 047440085509..bca96990218d 100644 --- a/net/netfilter/ipset/ip_set_bitmap_ip.c +++ b/net/netfilter/ipset/ip_set_bitmap_ip.c @@ -13,7 +13,6 @@ #include <linux/ip.h> #include <linux/skbuff.h> #include <linux/errno.h> -#include <linux/uaccess.h> #include <linux/bitops.h> #include <linux/spinlock.h> #include <linux/netlink.h> diff --git a/net/netfilter/ipset/ip_set_bitmap_ipmac.c b/net/netfilter/ipset/ip_set_bitmap_ipmac.c index d826332d2937..5e790172deff 100644 --- a/net/netfilter/ipset/ip_set_bitmap_ipmac.c +++ b/net/netfilter/ipset/ip_set_bitmap_ipmac.c @@ -15,9 +15,6 @@ #include <linux/etherdevice.h> #include <linux/skbuff.h> #include <linux/errno.h> -#include <linux/uaccess.h> -#include <linux/bitops.h> -#include <linux/spinlock.h> #include <linux/if_ether.h> #include <linux/netlink.h> #include <linux/jiffies.h> diff --git a/net/netfilter/ipset/ip_set_bitmap_port.c b/net/netfilter/ipset/ip_set_bitmap_port.c index 92074bb64134..165f09b1a9cb 100644 --- a/net/netfilter/ipset/ip_set_bitmap_port.c +++ b/net/netfilter/ipset/ip_set_bitmap_port.c @@ -9,13 +9,8 @@ #include <linux/module.h> #include <linux/ip.h> -#include <linux/tcp.h> -#include <linux/udp.h> #include <linux/skbuff.h> #include <linux/errno.h> -#include <linux/uaccess.h> -#include <linux/bitops.h> -#include <linux/spinlock.h> #include <linux/netlink.h> #include <linux/jiffies.h> #include <linux/timer.h> diff --git a/net/netfilter/ipset/ip_set_hash_ip.c b/net/netfilter/ipset/ip_set_hash_ip.c index 53964bc831aa..43bcce200129 100644 --- a/net/netfilter/ipset/ip_set_hash_ip.c +++ b/net/netfilter/ipset/ip_set_hash_ip.c @@ -12,9 +12,6 @@ #include <linux/ip.h> #include <linux/skbuff.h> #include <linux/errno.h> -#include <linux/uaccess.h> -#include <linux/bitops.h> -#include <linux/spinlock.h> #include <linux/random.h> #include <net/ip.h> #include <net/ipv6.h> diff --git a/net/netfilter/ipset/ip_set_hash_ipport.c b/net/netfilter/ipset/ip_set_hash_ipport.c index d9b192818e58..adbe787ea5dc 100644 --- a/net/netfilter/ipset/ip_set_hash_ipport.c +++ b/net/netfilter/ipset/ip_set_hash_ipport.c @@ -12,9 +12,6 @@ #include <linux/ip.h> #include <linux/skbuff.h> #include <linux/errno.h> -#include <linux/uaccess.h> -#include <linux/bitops.h> -#include <linux/spinlock.h> #include <linux/random.h> #include <net/ip.h> #include <net/ipv6.h> diff --git a/net/netfilter/ipset/ip_set_hash_ipportip.c b/net/netfilter/ipset/ip_set_hash_ipportip.c index 80dae9de5d18..22e23abb86c6 100644 --- a/net/netfilter/ipset/ip_set_hash_ipportip.c +++ b/net/netfilter/ipset/ip_set_hash_ipportip.c @@ -12,9 +12,6 @@ #include <linux/ip.h> #include <linux/skbuff.h> #include <linux/errno.h> -#include <linux/uaccess.h> -#include <linux/bitops.h> -#include <linux/spinlock.h> #include <linux/random.h> #include <net/ip.h> #include <net/ipv6.h> diff --git a/net/netfilter/ipset/ip_set_hash_ipportnet.c b/net/netfilter/ipset/ip_set_hash_ipportnet.c index 8eacd8a46c1c..6033e8b54bbd 100644 --- a/net/netfilter/ipset/ip_set_hash_ipportnet.c +++ b/net/netfilter/ipset/ip_set_hash_ipportnet.c @@ -12,9 +12,6 @@ #include <linux/ip.h> #include <linux/skbuff.h> #include <linux/errno.h> -#include <asm/uaccess.h> -#include <asm/bitops.h> -#include <linux/spinlock.h> #include <linux/random.h> #include <net/ip.h> #include <net/ipv6.h> diff --git a/net/netfilter/ipset/ip_set_hash_net.c b/net/netfilter/ipset/ip_set_hash_net.c index fb0e6a68d13e..c4db202b7da4 100644 --- a/net/netfilter/ipset/ip_set_hash_net.c +++ b/net/netfilter/ipset/ip_set_hash_net.c @@ -12,9 +12,6 @@ #include <linux/ip.h> #include <linux/skbuff.h> #include <linux/errno.h> -#include <linux/uaccess.h> -#include <linux/bitops.h> -#include <linux/spinlock.h> #include <linux/random.h> #include <net/ip.h> #include <net/ipv6.h> diff --git a/net/netfilter/ipset/ip_set_hash_netport.c b/net/netfilter/ipset/ip_set_hash_netport.c index 342250f9b114..34a165626ee9 100644 --- a/net/netfilter/ipset/ip_set_hash_netport.c +++ b/net/netfilter/ipset/ip_set_hash_netport.c @@ -12,9 +12,6 @@ #include <linux/ip.h> #include <linux/skbuff.h> #include <linux/errno.h> -#include <linux/uaccess.h> -#include <linux/bitops.h> -#include <linux/spinlock.h> #include <linux/random.h> #include <net/ip.h> #include <net/ipv6.h>