Commit 582e1fc85ca3727abd4e99109a267c514ea5c260

Authored by Patrick McHardy
1 parent 8da560ced5

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>

Showing 9 changed files with 0 additions and 27 deletions Side-by-side Diff

net/netfilter/ipset/ip_set_bitmap_ip.c
... ... @@ -13,7 +13,6 @@
13 13 #include <linux/ip.h>
14 14 #include <linux/skbuff.h>
15 15 #include <linux/errno.h>
16   -#include <linux/uaccess.h>
17 16 #include <linux/bitops.h>
18 17 #include <linux/spinlock.h>
19 18 #include <linux/netlink.h>
net/netfilter/ipset/ip_set_bitmap_ipmac.c
... ... @@ -15,9 +15,6 @@
15 15 #include <linux/etherdevice.h>
16 16 #include <linux/skbuff.h>
17 17 #include <linux/errno.h>
18   -#include <linux/uaccess.h>
19   -#include <linux/bitops.h>
20   -#include <linux/spinlock.h>
21 18 #include <linux/if_ether.h>
22 19 #include <linux/netlink.h>
23 20 #include <linux/jiffies.h>
net/netfilter/ipset/ip_set_bitmap_port.c
... ... @@ -9,13 +9,8 @@
9 9  
10 10 #include <linux/module.h>
11 11 #include <linux/ip.h>
12   -#include <linux/tcp.h>
13   -#include <linux/udp.h>
14 12 #include <linux/skbuff.h>
15 13 #include <linux/errno.h>
16   -#include <linux/uaccess.h>
17   -#include <linux/bitops.h>
18   -#include <linux/spinlock.h>
19 14 #include <linux/netlink.h>
20 15 #include <linux/jiffies.h>
21 16 #include <linux/timer.h>
net/netfilter/ipset/ip_set_hash_ip.c
... ... @@ -12,9 +12,6 @@
12 12 #include <linux/ip.h>
13 13 #include <linux/skbuff.h>
14 14 #include <linux/errno.h>
15   -#include <linux/uaccess.h>
16   -#include <linux/bitops.h>
17   -#include <linux/spinlock.h>
18 15 #include <linux/random.h>
19 16 #include <net/ip.h>
20 17 #include <net/ipv6.h>
net/netfilter/ipset/ip_set_hash_ipport.c
... ... @@ -12,9 +12,6 @@
12 12 #include <linux/ip.h>
13 13 #include <linux/skbuff.h>
14 14 #include <linux/errno.h>
15   -#include <linux/uaccess.h>
16   -#include <linux/bitops.h>
17   -#include <linux/spinlock.h>
18 15 #include <linux/random.h>
19 16 #include <net/ip.h>
20 17 #include <net/ipv6.h>
net/netfilter/ipset/ip_set_hash_ipportip.c
... ... @@ -12,9 +12,6 @@
12 12 #include <linux/ip.h>
13 13 #include <linux/skbuff.h>
14 14 #include <linux/errno.h>
15   -#include <linux/uaccess.h>
16   -#include <linux/bitops.h>
17   -#include <linux/spinlock.h>
18 15 #include <linux/random.h>
19 16 #include <net/ip.h>
20 17 #include <net/ipv6.h>
net/netfilter/ipset/ip_set_hash_ipportnet.c
... ... @@ -12,9 +12,6 @@
12 12 #include <linux/ip.h>
13 13 #include <linux/skbuff.h>
14 14 #include <linux/errno.h>
15   -#include <asm/uaccess.h>
16   -#include <asm/bitops.h>
17   -#include <linux/spinlock.h>
18 15 #include <linux/random.h>
19 16 #include <net/ip.h>
20 17 #include <net/ipv6.h>
net/netfilter/ipset/ip_set_hash_net.c
... ... @@ -12,9 +12,6 @@
12 12 #include <linux/ip.h>
13 13 #include <linux/skbuff.h>
14 14 #include <linux/errno.h>
15   -#include <linux/uaccess.h>
16   -#include <linux/bitops.h>
17   -#include <linux/spinlock.h>
18 15 #include <linux/random.h>
19 16 #include <net/ip.h>
20 17 #include <net/ipv6.h>
net/netfilter/ipset/ip_set_hash_netport.c
... ... @@ -12,9 +12,6 @@
12 12 #include <linux/ip.h>
13 13 #include <linux/skbuff.h>
14 14 #include <linux/errno.h>
15   -#include <linux/uaccess.h>
16   -#include <linux/bitops.h>
17   -#include <linux/spinlock.h>
18 15 #include <linux/random.h>
19 16 #include <net/ip.h>
20 17 #include <net/ipv6.h>