diff options
| author |  David S. Miller <davem@davemloft.net>
| 2017-01-11 14:43:39 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2017-01-11 14:43:39 -0500 |
| commit | 02ac5d1487115d160fab4c3e61b7edc20a945af9 (patch) | |
| tree | 08a39341379ce6f1ad4f3997df36c76ee82cee9c /net/ipv6/route.c | |
| parent | Merge branch 'cls_flower-ARP' (diff) | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| download | linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.gz linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.bz2 linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two AF_* families adding entries to the lockdep tables
at the same time.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 8417c41d8ec8..ce5aaf448c54 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1464,7 +1464,7 @@ static struct rt6_info *__ip6_route_redirect(struct net *net, struct fib6_node *fn; /* Get the "current" route for this destination and - * check if the redirect has come from approriate router. + * check if the redirect has come from appropriate router. * * RFC 4861 specifies that redirects should only be * accepted if they come from the nexthop to the target. @@ -2768,7 +2768,7 @@ static int rt6_mtu_change_route(struct rt6_info *rt, void *p_arg) old MTU is the lowest MTU in the path, update the route PMTU to reflect the increase. In this case if the other nodes' MTU also have the lowest MTU, TOO BIG MESSAGE will be lead to - PMTU discouvery. + PMTU discovery. */ if (rt->dst.dev == arg->dev && dst_metric_raw(&rt->dst, RTAX_MTU) && |