diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-18 09:33:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-18 09:33:27 -0700 |
| commit | e366fa435032db1ce1538a2c029714666985dd48 (patch) | |
| tree | d08bab02ba212339e4cfc0f2e3666435dd795b90 /net/sched/act_sample.c | |
| parent | cf7d97e1e54d71679a8b11716dad9d21deb0e1e2 (diff) | |
| parent | 5211da9ca526a5adddee1ccd078e6e33a583ab36 (diff) | |
| download | linux-e366fa435032db1ce1538a2c029714666985dd48.tar.bz2 | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Two new tls tests added in parallel in both net and net-next.
Used Stephen Rothwell's linux-next resolution.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_sample.c')
| -rw-r--r-- | net/sched/act_sample.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c index 83a133375d6d..1a0c682fd734 100644 --- a/net/sched/act_sample.c +++ b/net/sched/act_sample.c @@ -69,7 +69,7 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla, if (!exists) { ret = tcf_idr_create(tn, parm->index, est, a, - &act_sample_ops, bind, false); + &act_sample_ops, bind, true); if (ret) { tcf_idr_cleanup(tn, parm->index); return ret; |