diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-29 21:07:00 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-29 21:07:00 +0400 |
| commit | 4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125 (patch) | |
| tree | 888b52771f540552a9dc85521d8dddf66eba9aeb /net/sched/act_police.c | |
| parent | 9b3965f7401b0cc3ed2c228085a4c13b1c9243b1 (diff) | |
| parent | f4bcd8ccddb02833340652e9f46f5127828eb79d (diff) | |
| download | linux-4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125.tar.xz | |
Merge commit 'f4bcd8ccddb02833340652e9f46f5127828eb79d' into x86/build
Bring in upstream merge of x86/kaslr for future patches.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'net/sched/act_police.c')
| -rw-r--r-- | net/sched/act_police.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index 16a62c36928a..ef246d87e68b 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c @@ -177,10 +177,12 @@ static int tcf_act_police_locate(struct net *net, struct nlattr *nla, if (bind) { police->tcf_bindcnt += 1; police->tcf_refcnt += 1; + return 0; } if (ovr) goto override; - return ret; + /* not replacing */ + return -EEXIST; } } |