Re: [vserver] Hunk #1 FAILED at 80 in include/net/addrconf.h.rej

From: Corey Wright <undefined_at_pobox.com>
Date: Mon 29 Jul 2013 - 08:09:28 BST
Message-Id: <20130729020928.ef54347cbe3ba17f6e53b940@pobox.com>

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_at_lihas.de - Web: http://lihas.de
> Linux, Netzwerke, Consulting & Support - USt-ID: DE 227 816 626 Stuttgart

Received on Mon Jul 29 08:09:41 2013
[Next/Previous Months] [Main vserver Project Homepage] [Howto Subscribe/Unsubscribe] [Paul Sladen's vserver stuff]
Generated on Mon 29 Jul 2013 - 08:09:41 BST by hypermail 2.1.8