summaryrefslogtreecommitdiffstats
path: root/net/ipv6/addrconf.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-03-15 23:02:08 +0100
committerJohn W. Linville <linville@tuxdriver.com>2006-03-15 23:02:08 +0100
commitdd288e7d75b9041f79fecae77d61cfa345da7266 (patch)
tree85ff1d1ea0fe1d6eae0b6819422d5c6c05f862cd /net/ipv6/addrconf.c
parent[PATCH] drivers/net/e1000/: proper prototypes (diff)
parent[PATCH] ieee80211: Fix QoS is not active problem (diff)
downloadlinux-dd288e7d75b9041f79fecae77d61cfa345da7266.tar.xz
linux-dd288e7d75b9041f79fecae77d61cfa345da7266.zip
Merge branch 'upstream-fixes'
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r--net/ipv6/addrconf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index b7d8822c1be4..19727d941962 100644
--- 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;
};