summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/af_inet.c3
-rw-r--r--net/ipv4/fib_semantics.c3
-rw-r--r--net/ipv4/nexthop.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 6e62e80236a4..8036e76aa1e4 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1737,8 +1737,7 @@ static __net_init int ipv4_mib_init_net(struct net *net)
net->mib.icmp_statistics = alloc_percpu(struct icmp_mib);
if (!net->mib.icmp_statistics)
goto err_icmp_mib;
- net->mib.icmpmsg_statistics = kzalloc_obj(struct icmpmsg_mib,
- GFP_KERNEL);
+ net->mib.icmpmsg_statistics = kzalloc_obj(struct icmpmsg_mib);
if (!net->mib.icmpmsg_statistics)
goto err_icmpmsg_mib;
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index a521ac0da2f7..01cb587866d8 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -365,8 +365,7 @@ static struct hlist_head *fib_info_laddrhash_bucket(const struct net *net,
static struct hlist_head *fib_info_hash_alloc(unsigned int hash_bits)
{
/* The second half is used for prefsrc */
- return kvzalloc_objs(struct hlist_head, (1 << hash_bits) * 2,
- GFP_KERNEL);
+ return kvzalloc_objs(struct hlist_head, (1 << hash_bits) * 2);
}
static void fib_info_hash_free(struct hlist_head *head)
diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c
index 3518c5f27cb2..defe6b30f18f 100644
--- a/net/ipv4/nexthop.c
+++ b/net/ipv4/nexthop.c
@@ -137,8 +137,7 @@ static int nh_notifier_mpath_info_init(struct nh_notifier_info *info,
int i;
info->type = NH_NOTIFIER_INFO_TYPE_GRP;
- info->nh_grp = kzalloc_flex(*info->nh_grp, nh_entries, num_nh,
- GFP_KERNEL);
+ info->nh_grp = kzalloc_flex(*info->nh_grp, nh_entries, num_nh);
if (!info->nh_grp)
return -ENOMEM;