diff --git a/[refs] b/[refs] index 778250afa648..8fb88a6d43c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ade309be739eceedc4812798da09d698a59867d +refs/heads/master: 0d27b42739ee432a66104793e51a23807b372928 diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c index b7d8822c1be4..19727d941962 100644 --- a/trunk/net/ipv6/addrconf.c +++ b/trunk/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; };