Subject: Re: [vserver] Hunk #1 FAILED at 80 in include/net/addrconf.h.rej
From: Corey Wright <undefined@pobox.com>
Date: Mon, 29 Jul 2013 02:09:28 -0500
Mon, 29 Jul 2013 02:09:28 -0500
On Mon, 29 Jul 2013 08:45:48 +0200
Christian Recktenwald <kernel@lihas.de> wrote:

> sources: 3.4.55 , vs2.3.3.9
> 
> include/net/addrconf.h.rej: 
> 
> --- include/net/addrconf.h      2012-05-21 16:07:33.000000000 +0000
> +++ include/net/addrconf.h      2012-05-21 16:15:05.000000000 +0000
> @@ -80,7 +80,8 @@
>                                                struct net device *dev,
>                                                const struct in6 addr *daddr,
>                                                unsigned int srcprefs,
> -                                              struct in6 addr *saddr);
> +                                              struct in6 addr *saddr,
> +                                              struct nx info *nxi);
>  extern int                     ipv6 get lladdr(struct net device *dev,
>                                                 struct in6 addr *addr,
>                                                 unsigned char banned flags);
> 
> looks like there has been added:
> 
> extern int                        ipv6 get lladdr(struct inet6 dev *idev,
>                                                   struct in6 addr *addr,
>                                                   unsigned char banned flags);
> at line 84

yes, i'm in the middle of compiling the fixed up 3.0.88-vs2.3.2.5 and was
waiting to post the patch until i had at least tested it on virtualbox, but
since you bring it up...

patch: see attached
upstream change:
http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.0.y&id=52ef39eeff06aecc56266902bba6bf28891cabd3
(for 3.0.y, at least)

corey
--
undefined@pobox.com

> -- 
> LiHAS - Adrian Reyer - Hessenwiesenstraße 10 - D-70565 Stuttgart
> Fon: +49 (7 11) 78 28 50 90 - Fax:  +49 (7 11) 78 28 50 91
> Mail: lihas@lihas.de - Web: http://lihas.de
> Linux, Netzwerke, Consulting & Support - USt-ID: DE 227 816 626 Stuttgart


diff -urNpd linux-3.0.88/include/net/addrconf.h linux-3.0.88-vs2.3.2.5/include/net/addrconf.h
--- linux-3.0.88/include/net/addrconf.h	2013-07-29 01:23:56.000000000 -0500
+++ linux-3.0.88-vs2.3.2.5/include/net/addrconf.h	2013-07-29 01:21:02.000000000 -0500
@@ -80,7 +80,8 @@ extern int			ipv6_dev_get_saddr(struct n
 					       struct net_device *dev,
 					       const struct in6_addr *daddr,
 					       unsigned int srcprefs,
-					       struct in6_addr *saddr);
+					       struct in6_addr *saddr,
+					       struct nx_info *nxi);
 extern int			__ipv6_get_lladdr(struct inet6_dev *idev,
 						  struct in6_addr *addr,
 						  unsigned char banned_flags);
diff -urNpd linux-3.0.88/Makefile linux-3.0.88-vs2.3.2.5/Makefile
--- linux-3.0.88/Makefile	2013-07-29 01:23:56.000000000 -0500
+++ linux-3.0.88-vs2.3.2.5/Makefile	2013-07-29 01:21:20.000000000 -0500
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 0
 SUBLEVEL = 88
-EXTRAVERSION =
+EXTRAVERSION = -vs2.3.2.5
 NAME = Sneaky Weasel
 
 # *DOCUMENTATION*