diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 11:41:51 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 16:01:49 +0800 |
| commit | 70e00db9eb8ffc4dcaf5f035ec6a4440ba428794 (patch) | |
| tree | ea67e279adedc950c3d4d8e98546b3823a2b3e93 /include/crypto/if_alg.h | |
| parent | 34e0913e457f8469667faf5fa600447aa93371cf (diff) | |
| parent | dfbed80c63bb8d965067da3a6dbcc4682edcce0c (diff) | |
Merge remote-tracking branch 'lts/linux-3.14.y' into linux-linaro-lsk-v3.14lsk-v3.14-16.03linux-linaro-lsk-v3.14
Conflicts:
Most of conflicts are due to efivar_validate() change which
introduced a new parameter to check efi guid.
I added efi guid for this change in sanity_check()/efivar_create()
in drivers/firmware/efi/efivars.c
and keep new efivar_validate() in drivers/firmware/efi/vars.c,
since it's newer than LSK version.
nothing need mentioned in include/linux/efi.h
Diffstat (limited to 'include/crypto/if_alg.h')
| -rw-r--r-- | include/crypto/if_alg.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h index 2f38daaab3d7..d61c11170213 100644 --- a/include/crypto/if_alg.h +++ b/include/crypto/if_alg.h @@ -30,8 +30,6 @@ struct alg_sock { struct sock *parent; - unsigned int refcnt; - const struct af_alg_type *type; void *private; }; @@ -66,7 +64,6 @@ int af_alg_register_type(const struct af_alg_type *type); int af_alg_unregister_type(const struct af_alg_type *type); int af_alg_release(struct socket *sock); -void af_alg_release_parent(struct sock *sk); int af_alg_accept(struct sock *sk, struct socket *newsock); int af_alg_make_sg(struct af_alg_sgl *sgl, void __user *addr, int len, @@ -83,6 +80,11 @@ static inline struct alg_sock *alg_sk(struct sock *sk) return (struct alg_sock *)sk; } +static inline void af_alg_release_parent(struct sock *sk) +{ + sock_put(alg_sk(sk)->parent); +} + static inline void af_alg_init_completion(struct af_alg_completion *completion) { init_completion(&completion->completion); |