diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-12 22:19:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-12 22:19:46 -0400 |
| commit | 6fb9114e4bc4b9144306bc2c64abd18b364409d7 (patch) | |
| tree | a9e58416c5f77cd0764331ba81833f2313e07bb7 /net/ipv6/route.c | |
| parent | 03e1ad7b5d871d4189b1da3125c2f12d1b5f7d0b (diff) | |
| parent | 05f175cdcf9d3615c1633615d87891ebfb729401 (diff) | |
Merge branch 'net-2.6.26-misc-20080412b' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 269b76093288..6293cb91ed1d 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
| @@ -556,8 +556,8 @@ out: | |||
| 556 | 556 | ||
| 557 | } | 557 | } |
| 558 | 558 | ||
| 559 | struct rt6_info *rt6_lookup(struct net *net, struct in6_addr *daddr, | 559 | struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr, |
| 560 | struct in6_addr *saddr, int oif, int strict) | 560 | const struct in6_addr *saddr, int oif, int strict) |
| 561 | { | 561 | { |
| 562 | struct flowi fl = { | 562 | struct flowi fl = { |
| 563 | .oif = oif, | 563 | .oif = oif, |
| @@ -925,7 +925,7 @@ static DEFINE_SPINLOCK(icmp6_dst_lock); | |||
| 925 | 925 | ||
| 926 | struct dst_entry *icmp6_dst_alloc(struct net_device *dev, | 926 | struct dst_entry *icmp6_dst_alloc(struct net_device *dev, |
| 927 | struct neighbour *neigh, | 927 | struct neighbour *neigh, |
| 928 | struct in6_addr *addr) | 928 | const struct in6_addr *addr) |
| 929 | { | 929 | { |
| 930 | struct rt6_info *rt; | 930 | struct rt6_info *rt; |
| 931 | struct inet6_dev *idev = in6_dev_get(dev); | 931 | struct inet6_dev *idev = in6_dev_get(dev); |