Merge branch 'do-not-allow-adding-routes-if-disable_ipv6-is-enabled'
authorDavid S. Miller <davem@davemloft.net>
Fri, 30 Mar 2018 16:20:53 +0000 (12:20 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 30 Mar 2018 16:20:53 +0000 (12:20 -0400)
commite7696042fe9351b90a2dc2e4e042283192ccacbe
treecd4473489e416a897bb1c4fa6b9354024523fd6f
parentd162190bded8b3f635d1ba1e27e63d1b4a720ba8
parent2f0aaf7fb11c90645bbda447c1d26f5b0b04e984
Merge branch 'do-not-allow-adding-routes-if-disable_ipv6-is-enabled'

Lorenzo Bianconi says:

====================
do not allow adding routes if disable_ipv6 is enabled

Do not allow userspace to add static ipv6 routes if disable_ipv6 is enabled.
Update disable_ipv6 documentation according to that change

Changes since v1:
- added an extack message telling the user that IPv6 is disabled on the nexthop
  device
- rebased on-top of net-next
====================

Signed-off-by: David S. Miller <davem@davemloft.net>