diff options
author | Thomas Graf <tgraf@suug.ch> | 2012-06-27 23:57:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-28 20:56:43 -0400 |
commit | 58050fce3530939372e6c2f4b4beb76fcb4caa65 (patch) | |
tree | ee2b85eda9973fed36102dad66f583e43a4a6cab /drivers/net/team | |
parent | 9f10d3f6f966ef6f6a8d025a4b1d341923d04607 (diff) |
net: Use NLMSG_DEFAULT_SIZE in combination with nlmsg_new()
Using NLMSG_GOODSIZE results in multiple pages being used as
nlmsg_new() will automatically add the size of the netlink
header to the payload thus exceeding the page limit.
NLMSG_DEFAULT_SIZE takes this into account.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Cc: Jiri Pirko <jpirko@redhat.com>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Sergey Lapin <slapin@ossfans.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Lauro Ramos Venancio <lauro.venancio@openbossa.org>
Cc: Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Reviewed-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team')
-rw-r--r-- | drivers/net/team/team.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 5350eeaa22ce..89853c31e7f4 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c | |||
@@ -1476,7 +1476,7 @@ static int team_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info) | |||
1476 | void *hdr; | 1476 | void *hdr; |
1477 | int err; | 1477 | int err; |
1478 | 1478 | ||
1479 | msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL); | 1479 | msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); |
1480 | if (!msg) | 1480 | if (!msg) |
1481 | return -ENOMEM; | 1481 | return -ENOMEM; |
1482 | 1482 | ||
@@ -1538,7 +1538,7 @@ static int team_nl_send_generic(struct genl_info *info, struct team *team, | |||
1538 | struct sk_buff *skb; | 1538 | struct sk_buff *skb; |
1539 | int err; | 1539 | int err; |
1540 | 1540 | ||
1541 | skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL); | 1541 | skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); |
1542 | if (!skb) | 1542 | if (!skb) |
1543 | return -ENOMEM; | 1543 | return -ENOMEM; |
1544 | 1544 | ||
@@ -1648,7 +1648,7 @@ static int __send_and_alloc_skb(struct sk_buff **pskb, | |||
1648 | if (err) | 1648 | if (err) |
1649 | return err; | 1649 | return err; |
1650 | } | 1650 | } |
1651 | *pskb = genlmsg_new(NLMSG_DEFAULT_SIZE - GENL_HDRLEN, GFP_KERNEL); | 1651 | *pskb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL); |
1652 | if (!*pskb) | 1652 | if (!*pskb) |
1653 | return -ENOMEM; | 1653 | return -ENOMEM; |
1654 | return 0; | 1654 | return 0; |
@@ -2016,7 +2016,7 @@ static int team_nl_send_event_port_list_get(struct team *team) | |||
2016 | int err; | 2016 | int err; |
2017 | struct net *net = dev_net(team->dev); | 2017 | struct net *net = dev_net(team->dev); |
2018 | 2018 | ||
2019 | skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL); | 2019 | skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); |
2020 | if (!skb) | 2020 | if (!skb) |
2021 | return -ENOMEM; | 2021 | return -ENOMEM; |
2022 | 2022 | ||