From 357a18f1261996b7d9195cf80cb676f63c6eb7e4 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 25 Feb 2012 20:28:05 -0500 Subject: [PATCH] --- yaml --- r: 290481 b: refs/heads/master c: 48e316bc2e045206248c6c75c0d5bbc0c9ddc32c h: refs/heads/master i: 290479: 3d4c95ce58548e02bcaf9cbb79006ffa22ef71e4 v: v3 --- [refs] | 2 +- trunk/include/net/xfrm.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 395def6c31ac..785b611f78e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e85e36390c55230975f842ed5b14aad6ab490059 +refs/heads/master: 48e316bc2e045206248c6c75c0d5bbc0c9ddc32c 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)