mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-27 09:02:06 +00:00
[NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c96c9471dd
commit
ab27cfb85c
3 changed files with 48 additions and 41 deletions
|
@ -23,6 +23,7 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/kmod.h>
|
||||
#include <linux/netlink.h>
|
||||
#include <linux/err.h>
|
||||
#include <net/net_namespace.h>
|
||||
#include <net/sock.h>
|
||||
#include <net/netlink.h>
|
||||
|
@ -487,23 +488,22 @@ int tcf_exts_validate(struct tcf_proto *tp, struct nlattr **tb,
|
|||
|
||||
#ifdef CONFIG_NET_CLS_ACT
|
||||
{
|
||||
int err;
|
||||
struct tc_action *act;
|
||||
|
||||
if (map->police && tb[map->police]) {
|
||||
act = tcf_action_init_1(tb[map->police], rate_tlv,
|
||||
"police", TCA_ACT_NOREPLACE,
|
||||
TCA_ACT_BIND, &err);
|
||||
if (act == NULL)
|
||||
return err;
|
||||
TCA_ACT_BIND);
|
||||
if (IS_ERR(act))
|
||||
return PTR_ERR(act);
|
||||
|
||||
act->type = TCA_OLD_COMPAT;
|
||||
exts->action = act;
|
||||
} else if (map->action && tb[map->action]) {
|
||||
act = tcf_action_init(tb[map->action], rate_tlv, NULL,
|
||||
TCA_ACT_NOREPLACE, TCA_ACT_BIND, &err);
|
||||
if (act == NULL)
|
||||
return err;
|
||||
TCA_ACT_NOREPLACE, TCA_ACT_BIND);
|
||||
if (IS_ERR(act))
|
||||
return PTR_ERR(act);
|
||||
|
||||
exts->action = act;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue