diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 18:58:02 +0100 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 18:58:02 +0100 |
commit | 1a02e59a2970f9ed28ab51d3b08624b79e54d848 (patch) | |
tree | 470cce472be3b08c160e0c569648e7228651b12a /net/ipv6/addrconf.c | |
parent | ppc32: Fix BCSR_SIZE for MPC834x SYS (diff) | |
parent | [PATCH] powerpc: Fix bug in bug fix for bug in lmb_alloc() (diff) | |
download | linux-1a02e59a2970f9ed28ab51d3b08624b79e54d848.tar.xz linux-1a02e59a2970f9ed28ab51d3b08624b79e54d848.zip |
Merge branch 'master'
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 2 |
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; }; |