From: David S. Miller <davem@davemloft.net>
Date: Fri, 30 Mar 2018 16:20:53 +0000 (-0400)
Subject: Merge branch 'do-not-allow-adding-routes-if-disable_ipv6-is-enabled'
X-Git-Tag: v4.19~1326^2~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7696042fe9351b90a2dc2e4e042283192ccacbe;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

e7696042fe9351b90a2dc2e4e042283192ccacbe