Hello.
In article <[EMAIL PROTECTED]> (at Sun, 10 Sep 2006 20:10:06 +0300), Diego
Beltrami <[EMAIL PROTECTED]> says:
> as part of this email you can find a patch which introduces the BEET mode
> (Bound
> End-to-End Tunnel) as specified by the ietf draft at the following link:
:
> Signed-off-by: Diego Beltrami <[EMAIL PROTECTED]>
> Miika Komu <[EMAIL PROTECTED]>
> Herbert Xu <[EMAIL PROTECTED]>
> Abhinav Pathak <[EMAIL PROTECTED]>
> Jeff Ahrenholz <[EMAIL PROTECTED]>
Please put one "Signed-off-by:" per person,.
> diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
> index 46a15c7..6a616de 100644
> --- a/include/linux/xfrm.h
> +++ b/include/linux/xfrm.h
> @@ -120,7 +120,8 @@ enum
>
> #define XFRM_MODE_TRANSPORT 0
> #define XFRM_MODE_TUNNEL 1
> -#define XFRM_MODE_MAX 2
> +#define XFRM_MODE_BEET 2
> +#define XFRM_MODE_MAX 3
>
> /* Netlink configuration messages. */
> enum {
This clearly indicates that this patch conflicts with current net-2.6.19.
Please rebase to the current tree.
--yoshfuji
-
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
