diff options
| author | David S. Miller | 2018-02-16 22:03:39 +0100 |
|---|---|---|
| committer | David S. Miller | 2018-02-16 22:03:39 +0100 |
| commit | ee99b2d8bf4ad6d03046a8c2f25bad7cfd9de64a (patch) | |
| tree | 63f71ac24b38a93233eec17193fd7f0e63419e20 /net/sched/act_mirred.c | |
| parent | Merge branch 'net-sched-act-add-extack-support' (diff) | |
| download | kernel-qcow2-linux-ee99b2d8bf4ad6d03046a8c2f25bad7cfd9de64a.tar.gz kernel-qcow2-linux-ee99b2d8bf4ad6d03046a8c2f25bad7cfd9de64a.tar.xz kernel-qcow2-linux-ee99b2d8bf4ad6d03046a8c2f25bad7cfd9de64a.zip | |
net: Revert sched action extack support series.
It was mis-applied and the changes had rejects.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_mirred.c')
| -rw-r--r-- | net/sched/act_mirred.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index abcd5f12b913..e6ff88f72900 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -80,12 +80,12 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla, bool exists = false; int ret; - if (!nla) + if (nla == NULL) return -EINVAL; ret = nla_parse_nested(tb, TCA_MIRRED_MAX, nla, mirred_policy, NULL); if (ret < 0) return ret; - if (!tb[TCA_MIRRED_PARMS]) + if (tb[TCA_MIRRED_PARMS] == NULL) return -EINVAL; parm = nla_data(tb[TCA_MIRRED_PARMS]); @@ -117,7 +117,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla, } if (!exists) { - if (!dev) + if (dev == NULL) return -EINVAL; ret = tcf_idr_create(tn, parm->index, est, a, &act_mirred_ops, bind, true); |