diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-09-19 16:46:07 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-09-19 16:46:07 +0200 |
| commit | d20bbfab01802e195a50435940f7e4aa747c217c (patch) | |
| tree | 82b0007e33c083050a4e60a49dbb2f5477b4c99d /net/xfrm/xfrm_algo.c | |
| parent | slub: doc: update the slabinfo.c file path (diff) | |
| parent | slub: explicitly document position of inserting slab to partial list (diff) | |
| download | linux-d20bbfab01802e195a50435940f7e4aa747c217c.tar.xz linux-d20bbfab01802e195a50435940f7e4aa747c217c.zip | |
Merge branch 'slab/urgent' into slab/next
Diffstat (limited to 'net/xfrm/xfrm_algo.c')
| -rw-r--r-- | net/xfrm/xfrm_algo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index 58064d9e565d..791ab2e77f3f 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c @@ -462,8 +462,8 @@ static struct xfrm_algo_desc ealg_list[] = { .desc = { .sadb_alg_id = SADB_X_EALG_AESCTR, .sadb_alg_ivlen = 8, - .sadb_alg_minbits = 128, - .sadb_alg_maxbits = 256 + .sadb_alg_minbits = 160, + .sadb_alg_maxbits = 288 } }, }; |