On Fri, 13 Apr 2007, Joy Latten wrote:
>
> Signed-off-by: Joy Latten <[EMAIL PROTECTED]>
Acked-by: James Morris <[EMAIL PROTECTED]>
>
>
> diff -urpN linux-2.6.20/net/xfrm/xfrm_user.c
> linux-2.6.20.patch/net/xfrm/xfrm_user.c
> --- linux-2.6.20/net/xfrm/xfrm_user.c 2007-04-12 15:12:27.000000000 -0500
> +++ linux-2.6.20.patch/net/xfrm/xfrm_user.c 2007-04-13 09:32:35.000000000
> -0500
> @@ -272,9 +272,8 @@ static int attach_encap_tmpl(struct xfrm
> }
>
>
> -static inline int xfrm_user_sec_ctx_size(struct xfrm_policy *xp)
> +static inline int xfrm_user_sec_ctx_size(struct xfrm_sec_ctx *xfrm_ctx)
> {
> - struct xfrm_sec_ctx *xfrm_ctx = xp->security;
> int len = 0;
>
> if (xfrm_ctx) {
> @@ -2170,7 +2169,7 @@ static int xfrm_send_acquire(struct xfrm
>
> len = RTA_SPACE(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr);
> len += NLMSG_SPACE(sizeof(struct xfrm_user_acquire));
> - len += RTA_SPACE(xfrm_user_sec_ctx_size(xp));
> + len += RTA_SPACE(xfrm_user_sec_ctx_size(x->security));
> #ifdef CONFIG_XFRM_SUB_POLICY
> len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type));
> #endif
> @@ -2280,7 +2279,7 @@ static int xfrm_exp_policy_notify(struct
>
> len = RTA_SPACE(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr);
> len += NLMSG_SPACE(sizeof(struct xfrm_user_polexpire));
> - len += RTA_SPACE(xfrm_user_sec_ctx_size(xp));
> + len += RTA_SPACE(xfrm_user_sec_ctx_size(xp->security));
> #ifdef CONFIG_XFRM_SUB_POLICY
> len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type));
> #endif
>
--
James Morris
<[EMAIL PROTECTED]>
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
