projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d1671a9
)
ipv6: Fix warning in addrconf code.
author
David Miller
<
[email protected]
>
Mon, 21 Jul 2008 01:17:02 +0000
(18:17 -0700)
committer
Linus Torvalds
<
[email protected]
>
Mon, 21 Jul 2008 04:18:26 +0000
(21:18 -0700)
Reported by Linus.
Signed-off-by: David S. Miller <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
net/ipv6/addrconf.c
patch
|
blob
|
history
diff --git
a/net/ipv6/addrconf.c
b/net/ipv6/addrconf.c
index 580ae506c399d5a2e6d0e07b5fbf3208ca5aeeff..9f4fcce6379b88d4a6e0b0f388257b8907b4aec3 100644
(file)
--- a/
net/ipv6/addrconf.c
+++ b/
net/ipv6/addrconf.c
@@
-2315,12
+2315,11
@@
static void init_loopback(struct net_device *dev)
static void addrconf_add_linklocal(struct inet6_dev *idev, struct in6_addr *addr)
{
struct inet6_ifaddr * ifp;
- struct net *net = dev_net(idev->dev);
u32 addr_flags = IFA_F_PERMANENT;
#ifdef CONFIG_IPV6_OPTIMISTIC_DAD
if (idev->cnf.optimistic_dad &&
- !
net
->ipv6.devconf_all->forwarding)
+ !
dev_net(idev->dev)
->ipv6.devconf_all->forwarding)
addr_flags |= IFA_F_OPTIMISTIC;
#endif