[kernel] r12196 - dists/sid/linux-2.6/debian/patches/features/all/vserver

[Bastian Blank]

Author: waldi
Date: Mon Sep  8 17:12:42 2008
New Revision: 12196

Log:
debian/patches/features/all/vserver/vs2.3.0.35.patch: Fix.


Modified:
   dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch

Modified: dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch	Mon Sep  8 17:12:42 2008
@@ -27147,7 +27147,7 @@
  #define ACONF_DEBUG 2
 @@ -1078,7 +1080,7 @@ out:
  
- int ipv6_dev_get_saddr(struct net_device *dst_dev,
+ int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
  		       const struct in6_addr *daddr, unsigned int prefs,
 -		       struct in6_addr *saddr)
 +		       struct in6_addr *saddr, struct nx_info *nxi)
@@ -27378,8 +27378,8 @@
 --- a/net/ipv6/fib6_rules.c	2008-07-14 17:22:58.000000000 -0400
 +++ a/net/ipv6/fib6_rules.c	2008-07-29 18:23:01.000000000 -0400
 @@ -95,7 +95,7 @@ static int fib6_rule_action(struct fib_r
- 
- 			if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev,
+ 			if (ipv6_dev_get_saddr(net
+ 					       ip6_dst_idev(&rt->u.dst)->dev,
  					       &flp->fl6_dst, srcprefs,
 -					       &saddr))
 +					       &saddr, NULL))
@@ -27434,7 +27434,7 @@
 +++ a/net/ipv6/ndisc.c	2008-07-29 18:19:07.000000000 -0400
 @@ -551,7 +551,7 @@ static void ndisc_send_na(struct net_dev
  	} else {
- 		if (ipv6_dev_get_saddr(dev, daddr,
+ 		if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
  				       inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
 -				       &tmpaddr))
 +				       &tmpaddr, NULL /* FIXME: ? */ ))
@@ -27444,9 +27444,9 @@
 --- a/net/ipv6/route.c	2008-07-14 17:22:58.000000000 -0400
 +++ a/net/ipv6/route.c	2008-07-29 18:56:21.000000000 -0400
 @@ -2181,7 +2181,8 @@ static int rt6_fill_node(struct sk_buff 
- 	} else if (dst) {
+ 		struct inet6_dev *idev = ip6_dst_idev(&rt->u.dst);
  		struct in6_addr saddr_buf;
- 		if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev,
+ 		if (ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
 -				       dst, 0, &saddr_buf) == 0)
 +			dst, 0, &saddr_buf,
 +			(skb->sk ? skb->sk->sk_nx_info : NULL)) == 0)
@@ -27505,8 +27505,8 @@
 --- a/net/ipv6/xfrm6_policy.c	2008-07-14 17:22:58.000000000 -0400
 +++ a/net/ipv6/xfrm6_policy.c	2008-07-29 18:21:53.000000000 -0400
 @@ -59,7 +59,7 @@ static int xfrm6_get_saddr(xfrm_address_
- 
- 	ipv6_dev_get_saddr(ip6_dst_idev(dst)->dev,
+ 	dev = ip6_dst_idev(dst)->dev;
+ 	ipv6_dev_get_saddr(dev_net(dev), dev,
  			   (struct in6_addr *)&daddr->a6, 0,
 -			   (struct in6_addr *)&saddr->a6);
 +			   (struct in6_addr *)&saddr->a6, NULL);