summaryrefslogtreecommitdiffstats
path: root/kernel/include/linux/netfilter/ipset/ip_set.h
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2010-12-16 12:34:49 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2010-12-16 12:34:49 +0100
commit5200ad226e7fcbbd069f539c309d17a9e66719af (patch)
tree850b74aad437a4b17ccab1fb1848dedba1e4aab2 /kernel/include/linux/netfilter/ipset/ip_set.h
parent3080a55074a595acdeb5bc85bbcd8dba9fa1bfc2 (diff)
Remove unnecessary gfp_flags arguments
Where the argument was used, the set lock was already activated, therefore the argument value was always GFP_ATOMIC.
Diffstat (limited to 'kernel/include/linux/netfilter/ipset/ip_set.h')
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h
index 1e18b14..df144cc 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set.h
@@ -214,8 +214,7 @@ enum ip_set_feature {
struct ip_set;
-typedef int (*ipset_adtfn)(struct ip_set *set, void *value,
- gfp_t gfp_flags, u32 timeout);
+typedef int (*ipset_adtfn)(struct ip_set *set, void *value, u32 timeout);
/* Set type, variant-specific part */
struct ip_set_type_variant {
@@ -231,7 +230,7 @@ struct ip_set_type_variant {
ipset_adtfn adt[IPSET_ADT_MAX];
/* When adding entries and set is full, try to resize the set */
- int (*resize)(struct ip_set *set, gfp_t gfp_flags, bool retried);
+ int (*resize)(struct ip_set *set, bool retried);
/* Destroy the set */
void (*destroy)(struct ip_set *set);
/* Flush the elements */