[Bridge] [PATCH net-next 4/7] net: vrf: Add extack messages for enslave errors

[David Ahern]

Signed-off-by: David Ahern <dsah...@gmail.com>
---
 drivers/net/vrf.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 77d0655a0250..0b54f553228e 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -772,8 +772,11 @@ static int do_vrf_add_slave(struct net_device *dev, struct 
net_device *port_dev,
        /* do not allow loopback device to be enslaved to a VRF.
         * The vrf device acts as the loopback for the vrf.
         */
-       if (port_dev == dev_net(dev)->loopback_dev)
+       if (port_dev == dev_net(dev)->loopback_dev) {
+               NL_SET_ERR_MSG(extack,
+                              "Can not enslave loopback device to a VRF");
                return -EOPNOTSUPP;
+       }
 
        port_dev->priv_flags |= IFF_L3MDEV_SLAVE;
        ret = netdev_master_upper_dev_link(port_dev, dev, NULL, NULL, extack);
@@ -792,7 +795,13 @@ static int do_vrf_add_slave(struct net_device *dev, struct 
net_device *port_dev,
 static int vrf_add_slave(struct net_device *dev, struct net_device *port_dev,
                         struct netlink_ext_ack *extack)
 {
-       if (netif_is_l3_master(port_dev) || netif_is_l3_slave(port_dev))
+       if (netif_is_l3_master(port_dev)) {
+               NL_SET_ERR_MSG(extack,
+                              "Can not enslave an L3 master device to a VRF");
+               return -EINVAL;
+       }
+
+       if (netif_is_l3_slave(port_dev))
                return -EINVAL;
 
        return do_vrf_add_slave(dev, port_dev, extack);
-- 
2.1.4