diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-12-16 12:34:49 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-12-16 12:34:49 +0100 |
| commit | 5200ad226e7fcbbd069f539c309d17a9e66719af (patch) | |
| tree | 850b74aad437a4b17ccab1fb1848dedba1e4aab2 /kernel/ip_set_hash_net.c | |
| parent | 3080a55074a595acdeb5bc85bbcd8dba9fa1bfc2 (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/ip_set_hash_net.c')
| -rw-r--r-- | kernel/ip_set_hash_net.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/ip_set_hash_net.c b/kernel/ip_set_hash_net.c index 97cdb83..b13ed98 100644 --- a/kernel/ip_set_hash_net.c +++ b/kernel/ip_set_hash_net.c @@ -152,7 +152,7 @@ hash_net4_kadt(struct ip_set *set, const struct sk_buff *skb, ip4addrptr(skb, flags & IPSET_DIM_ONE_SRC, &data.ip); data.ip &= NETMASK(data.cidr); - return adtfn(set, &data, GFP_ATOMIC, h->timeout); + return adtfn(set, &data, h->timeout); } static const struct nla_policy @@ -198,7 +198,7 @@ hash_net4_uadt(struct ip_set *set, struct nlattr *head, int len, timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]); } - ret = adtfn(set, &data, GFP_ATOMIC, timeout); + ret = adtfn(set, &data, timeout); return ip_set_eexist(ret, flags) ? 0 : ret; } @@ -335,7 +335,7 @@ hash_net6_kadt(struct ip_set *set, const struct sk_buff *skb, ip6addrptr(skb, flags & IPSET_DIM_ONE_SRC, &data.ip.in6); ip6_netmask(&data.ip, data.cidr); - return adtfn(set, &data, GFP_ATOMIC, h->timeout); + return adtfn(set, &data, h->timeout); } static int @@ -374,7 +374,7 @@ hash_net6_uadt(struct ip_set *set, struct nlattr *head, int len, timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]); } - ret = adtfn(set, &data, GFP_ATOMIC, timeout); + ret = adtfn(set, &data, timeout); return ip_set_eexist(ret, flags) ? 0 : ret; } |