diff --git a/[refs] b/[refs]
index 8a57491822a2..49cffe300f32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b3f129c5592ca35b3fe8916767c58b98710478c
+refs/heads/master: 461e6c856faf9cdd8862fa4d0785974a64e39dba
diff --git a/trunk/include/linux/xfrm.h b/trunk/include/linux/xfrm.h
index 0c82c80b277f..2ca6bae88721 100644
--- a/trunk/include/linux/xfrm.h
+++ b/trunk/include/linux/xfrm.h
@@ -97,10 +97,10 @@ struct xfrm_algo {
 };
 
 struct xfrm_algo_aead {
-	char	alg_name[64];
-	int	alg_key_len;	/* in bits */
-	int	alg_icv_len;	/* in bits */
-	char	alg_key[0];
+	char		alg_name[64];
+	unsigned int	alg_key_len;	/* in bits */
+	unsigned int	alg_icv_len;	/* in bits */
+	char		alg_key[0];
 };
 
 struct xfrm_stats {