projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[powerpc.git]
/
net
/
ipv6
/
addrconf.c
diff --git
a/net/ipv6/addrconf.c
b/net/ipv6/addrconf.c
index
1db5048
..
19727d9
100644
(file)
--- a/
net/ipv6/addrconf.c
+++ b/
net/ipv6/addrconf.c
@@
-822,7
+822,7
@@
struct ipv6_saddr_score {
int addr_type;
unsigned int attrs;
int matchlen;
-
unsigned int
scope;
+
int
scope;
unsigned int rule;
};
@@
-2165,6
+2165,9
@@
static int addrconf_notify(struct notifier_block *this, unsigned long event,
dev->name);
break;
}
+
+ if (idev)
+ idev->if_flags |= IF_READY;
} else {
if (!netif_carrier_ok(dev)) {
/* device is still not ready. */