net: make vlan ndo_vlan_rx_[add/kill]_vid return error value

Let caller know the result of adding/removing vlan id to/from vlan
filter.

In some drivers I make those functions to just return 0. But in those
where there is able to see if hw setup went correctly, return value is
set appropriately.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 74134970b709..2511bc5c34f3 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -520,7 +520,7 @@ static struct rtnl_link_stats64 *macvlan_dev_get_stats64(struct net_device *dev,
         return stats;
 }
 
-static void macvlan_vlan_rx_add_vid(struct net_device *dev,
+static int macvlan_vlan_rx_add_vid(struct net_device *dev,
                                     unsigned short vid)
 {
         struct macvlan_dev *vlan = netdev_priv(dev);
@@ -528,10 +528,11 @@ static void macvlan_vlan_rx_add_vid(struct net_device *dev,
         const struct net_device_ops *ops = lowerdev->netdev_ops;
 
         if (ops->ndo_vlan_rx_add_vid)
-                ops->ndo_vlan_rx_add_vid(lowerdev, vid);
+                return ops->ndo_vlan_rx_add_vid(lowerdev, vid);
+        return 0;
 }
 
-static void macvlan_vlan_rx_kill_vid(struct net_device *dev,
+static int macvlan_vlan_rx_kill_vid(struct net_device *dev,
                                      unsigned short vid)
 {
         struct macvlan_dev *vlan = netdev_priv(dev);
@@ -539,7 +540,8 @@ static void macvlan_vlan_rx_kill_vid(struct net_device *dev,
         const struct net_device_ops *ops = lowerdev->netdev_ops;
 
         if (ops->ndo_vlan_rx_kill_vid)
-                ops->ndo_vlan_rx_kill_vid(lowerdev, vid);
+                return ops->ndo_vlan_rx_kill_vid(lowerdev, vid);
+        return 0;
 }
 
 static void macvlan_ethtool_get_drvinfo(struct net_device *dev,