diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2002-12-07 22:28:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2002-12-07 22:28:56 -0800 |
| commit | b72e2aecaaeea6087ffaa4bb91b6b42fb7d0f46a (patch) | |
| tree | 6e4a8abf02884968c7de9ba48d97d3c1568bc17e /include | |
| parent | 51a169c1962ba2343936f3ff8326fb21eef56a08 (diff) | |
| parent | 43ff0e0d904418ea56b23632bdef704fcfbf6093 (diff) | |
Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5
into kernel.bkbits.net:/home/davem/net-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/crypto.h | 1 | ||||
| -rw-r--r-- | include/net/route.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index f82c74decefe..5c29e2b58011 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -161,7 +161,6 @@ struct compress_tfm { struct crypto_tfm { void *crt_ctx; - void *crt_work_block; u32 crt_flags; union { diff --git a/include/net/route.h b/include/net/route.h index afab97d19a81..593311a57fca 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -107,7 +107,7 @@ struct rt_cache_stat extern struct ip_rt_acct *ip_rt_acct; struct in_device; -extern void ip_rt_init(void); +extern int ip_rt_init(void); extern void ip_rt_redirect(u32 old_gw, u32 dst, u32 new_gw, u32 src, u8 tos, struct net_device *dev); extern void ip_rt_advice(struct rtable **rp, int advice); |