Merge tag 'v3.10.76' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ipv6 / ndisc.c

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index d1bc9987b8dc2c7e1647aa71e9173a110c041ed7..42c40b119c8995e47366722db891b679e9d2c50f 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1196,10 +1196,11 @@ static void ndisc_router_discovery(struct sk_buff *skb)
                /* Only set hop_limit on the interface if it is higher than
                 * the current hop_limit.
                 */
-               if (in6_dev->cnf.hop_limit < ra_msg->icmph.icmp6_hop_limit)
+               if (in6_dev->cnf.hop_limit < ra_msg->icmph.icmp6_hop_limit) {
                        in6_dev->cnf.hop_limit = ra_msg->icmph.icmp6_hop_limit;
-               else
+               } else {
                        ND_PRINTK(2, warn, "RA: Got route advertisement with lower hop_limit than current\n");
+               }
                if (rt)
                        dst_metric_set(&rt->dst, RTAX_HOPLIMIT,
                                       ra_msg->icmph.icmp6_hop_limit);