diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 21:21:36 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 21:21:36 -0500 |
| commit | 98c4514ff6e3072288770db66f91bdb15af8b433 (patch) | |
| tree | eb5f2541e70d27144720e1735b463471025908f0 /net/ipv6/ipv6_sockglue.c | |
| parent | 644a9d3b66e6983c2c1f3b24c3006d49b184c871 (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
Merge 3.7-rc6 into char-misc-next
Diffstat (limited to 'net/ipv6/ipv6_sockglue.c')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index ba6d13d1f1e1..e02faed6d17e 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c | |||
| @@ -827,6 +827,7 @@ pref_skip_coa: | |||
| 827 | if (val < 0 || val > 255) | 827 | if (val < 0 || val > 255) |
| 828 | goto e_inval; | 828 | goto e_inval; |
| 829 | np->min_hopcount = val; | 829 | np->min_hopcount = val; |
| 830 | retv = 0; | ||
| 830 | break; | 831 | break; |
| 831 | case IPV6_DONTFRAG: | 832 | case IPV6_DONTFRAG: |
| 832 | np->dontfrag = valbool; | 833 | np->dontfrag = valbool; |