diff --git a/[refs] b/[refs] index aa8a00a3b19f..b03f8c4055c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d74f1757001f5b9a7739c2a9053435e16ce516b +refs/heads/master: 946a720c814ff63a9e5c7755395bff080b931eae diff --git a/trunk/include/net/xfrm.h b/trunk/include/net/xfrm.h index 89174e29dca9..96239e78e621 100644 --- a/trunk/include/net/xfrm.h +++ b/trunk/include/net/xfrm.h @@ -1566,11 +1566,6 @@ extern struct xfrm_algo_desc *xfrm_calg_get_byname(const char *name, int probe); extern struct xfrm_algo_desc *xfrm_aead_get_byname(const char *name, int icv_len, int probe); -struct hash_desc; -struct scatterlist; -typedef int (icv_update_fn_t)(struct hash_desc *, struct scatterlist *, - unsigned int); - static inline int xfrm_addr_cmp(const xfrm_address_t *a, const xfrm_address_t *b, int family)