git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh
[pandora-kernel.git]
/
net
/
ipv6
/
ipv6_sockglue.c
diff --git
a/net/ipv6/ipv6_sockglue.c
b/net/ipv6/ipv6_sockglue.c
index
c99e3ee
..
26cb08c
100644
(file)
--- a/
net/ipv6/ipv6_sockglue.c
+++ b/
net/ipv6/ipv6_sockglue.c
@@
-503,7
+503,7
@@
done:
goto e_inval;
if (val > 255 || val < -1)
goto e_inval;
- np->mcast_hops =
val
;
+ np->mcast_hops =
(val == -1 ? IPV6_DEFAULT_MCASTHOPS : val)
;
retv = 0;
break;