summaryrefslogtreecommitdiff
path: root/net/netlink
diff options
context:
space:
mode:
Diffstat (limited to 'net/netlink')
-rw-r--r--net/netlink/af_netlink.c2
-rw-r--r--net/netlink/diag.c2
-rw-r--r--net/netlink/genetlink.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 2d91b8b8ba9a..4d609d5cf406 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2927,7 +2927,7 @@ static int __init netlink_proto_init(void)
BUILD_BUG_ON(sizeof(struct netlink_skb_parms) > sizeof_field(struct sk_buff, cb));
- nl_table = kzalloc_objs(*nl_table, MAX_LINKS, GFP_KERNEL);
+ nl_table = kzalloc_objs(*nl_table, MAX_LINKS);
if (!nl_table)
goto panic;
diff --git a/net/netlink/diag.c b/net/netlink/diag.c
index 25e930a64d07..1dfc340736b8 100644
--- a/net/netlink/diag.c
+++ b/net/netlink/diag.c
@@ -107,7 +107,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
num--;
if (!hti) {
- hti = kmalloc_obj(*hti, GFP_KERNEL);
+ hti = kmalloc_obj(*hti);
if (!hti)
return -ENOMEM;
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index ac1fdf7d7327..a23d4c51c089 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -659,7 +659,7 @@ static int genl_sk_privs_alloc(struct genl_family *family)
if (!family->sock_priv_size)
return 0;
- family->sock_privs = kzalloc_obj(*family->sock_privs, GFP_KERNEL);
+ family->sock_privs = kzalloc_obj(*family->sock_privs);
if (!family->sock_privs)
return -ENOMEM;
xa_init(family->sock_privs);
@@ -912,7 +912,7 @@ EXPORT_SYMBOL(genlmsg_put);
static struct genl_dumpit_info *genl_dumpit_info_alloc(void)
{
- return kmalloc_obj(struct genl_dumpit_info, GFP_KERNEL);
+ return kmalloc_obj(struct genl_dumpit_info);
}
static void genl_dumpit_info_free(const struct genl_dumpit_info *info)
@@ -937,7 +937,7 @@ genl_family_rcv_msg_attrs_parse(const struct genl_family *family,
if (!ops->maxattr)
return NULL;
- attrbuf = kmalloc_objs(struct nlattr *, ops->maxattr + 1, GFP_KERNEL);
+ attrbuf = kmalloc_objs(struct nlattr *, ops->maxattr + 1);
if (!attrbuf)
return ERR_PTR(-ENOMEM);
@@ -1590,7 +1590,7 @@ static int ctrl_dumppolicy_start(struct netlink_callback *cb)
return 0;
}
- ctx->op_iter = kmalloc_obj(*ctx->op_iter, GFP_KERNEL);
+ ctx->op_iter = kmalloc_obj(*ctx->op_iter);
if (!ctx->op_iter)
return -ENOMEM;