diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-11-25 12:55:17 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-11-25 12:55:17 +0800 |
| commit | 068e31608ab2e664dce897343a3e5d43c4f023e3 (patch) | |
| tree | 8f3cb76ede9e94d1abe48d3f94f627bb8864272f /include/linux | |
| parent | 662d618b983cd0566a1cc2ed28c09a0a4b07b9f3 (diff) | |
| parent | 5497d2d7d543b4b8854700d47a175e157fecbfd1 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
drivers/usb/gadget/function/u_ether.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/filter.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index 5110d4211866..ccb98b459c59 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -421,7 +421,11 @@ static inline void bpf_prog_unlock_ro(struct bpf_prog *fp) } #endif /* CONFIG_DEBUG_SET_MODULE_RONX */ -int sk_filter(struct sock *sk, struct sk_buff *skb); +int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap); +static inline int sk_filter(struct sock *sk, struct sk_buff *skb) +{ + return sk_filter_trim_cap(sk, skb, 1); +} int bpf_prog_select_runtime(struct bpf_prog *fp); void bpf_prog_free(struct bpf_prog *fp); |