diff --git a/[refs] b/[refs] index 23b836a890d4..264783120634 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d88c305a03c37a95c4b27e1a0c2e387bb7ce80df +refs/heads/master: ba749ae98d5aa9d2ce9a7facde0deed454f92230 diff --git a/trunk/include/linux/xfrm.h b/trunk/include/linux/xfrm.h index 1131eabfaa2a..f8507eed0b79 100644 --- a/trunk/include/linux/xfrm.h +++ b/trunk/include/linux/xfrm.h @@ -92,7 +92,7 @@ struct xfrm_replay_state struct xfrm_algo { char alg_name[64]; - int alg_key_len; /* in bits */ + unsigned int alg_key_len; /* in bits */ char alg_key[0]; };